diff --git a/setup/owncloud.sh b/setup/owncloud.sh
index dce52c6a..88054a76 100644
--- a/setup/owncloud.sh
+++ b/setup/owncloud.sh
@@ -22,11 +22,12 @@ if [ ! -d /usr/local/lib/owncloud ]; then
 fi
 
 # Create a configuration file.
+TIMEZONE=`cat /etc/timezone`
 if [ ! -f "/usr/local/lib/owncloud/config/config.php" ]; then
     cat - > /usr/local/lib/owncloud/config/config.php <<EOF;
 <?php
 
-$CONFIG = array (
+\$CONFIG = array (
   'datadirectory' => '$STORAGE_ROOT/owncloud',
   array (
     0 =>
@@ -43,7 +44,7 @@ $CONFIG = array (
   ),
   'mail_smtpmode' => 'smtp',
   'mail_smtpsecure' => 'ssl',
-  'mail_from_address' => 'no-reply@$PRIMARY_HOSTNAME',
+  'mail_from_address' => 'no-reply',
   'mail_domain' => '$PRIMARY_HOSTNAME',
   'mail_smtpauthtype' => 'LOGIN',
   'mail_smtpauth' => true,
@@ -51,6 +52,7 @@ $CONFIG = array (
   'mail_smtpport' => '587',
   'mail_smtpname' => 'no-reply@$PRIMARY_HOSTNAME',
   'mail_smtppassword' => '$SECRET_PASSWORD',
+  'logtimezone' => '$TIMEZONE',
 );
 ?>
 EOF
diff --git a/setup/zpush.sh b/setup/zpush.sh
index bcb01c5c..7e2c0cf2 100755
--- a/setup/zpush.sh
+++ b/setup/zpush.sh
@@ -31,7 +31,8 @@ if [ ! -d /usr/local/lib/z-push ]; then
 fi
 
 # Configure default config
-# TODO: Add timezone etc?
+TIMEZONE=`cat /etc/timezone`
+sed -i "s/define('TIMEZONE', .*/define('TIMEZONE', '$TIMEZONE');/" /usr/local/lib/z-push/config.php
 sed -i "s/define('BACKEND_PROVIDER', .*/define('BACKEND_PROVIDER', 'BackendCombined');/" /usr/local/lib/z-push/config.php
 
 # Configure BACKEND