diff --git a/src/freedombone b/src/freedombone
index 07763e8c..404bf7f2 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -6590,6 +6590,11 @@ function install_owncloud_official_deb {
         fi
     fi
 
+    UPGRADING_OWNCLOUD=
+    if [ -d /etc/owncloud ]; then
+        UPGRADING_OWNCLOUD='yes'
+    fi
+
     # begin doing an upgrade if needed
     upgrade_owncloud_start
 
@@ -6673,7 +6678,7 @@ function install_owncloud_official_deb {
         chmod 600 /home/$MY_USERNAME/README
     fi
 
-    if [ -d /etc/owncloud ]; then
+    if [ $UPGRADING_OWNCLOUD ]; then
         remove_database owncloud
     fi
 
@@ -6890,15 +6895,19 @@ function install_owncloud_official_deb {
 
         sed -i "s|demo.example.org|${OWNCLOUD_DOMAIN_NAME}|g" $OWNCLOUD_PATH/config/config.php
         sed -i "s|otherdomain.example.org|${OWNCLOUD_ONION_HOSTNAME}|g" $OWNCLOUD_PATH/config/config.php
-        sed -i "s|'instanceid'.*|'instanceid' => '$OWNCLOUD_INSTANCE_ID',|g" $OWNCLOUD_PATH/config/config.php
-        sed -i "s|'passwordsalt'.*|'passwordsalt' => '$OWNCLOUD_PASSWORD_SALT',|g" $OWNCLOUD_PATH/config/config.php
+
+        if [ ! $UPGRADING_OWNCLOUD ]; then
+            sed -i "s|'instanceid'.*|'instanceid' => '$OWNCLOUD_INSTANCE_ID',|g" $OWNCLOUD_PATH/config/config.php
+            sed -i "s|'passwordsalt'.*|'passwordsalt' => '$OWNCLOUD_PASSWORD_SALT',|g" $OWNCLOUD_PATH/config/config.php
+            sed -i "s|'secret'.*|'secret' => '$OWNCLOUD_SECRET',|g" $OWNCLOUD_PATH/config/config.php
+        fi
         sed -i "s|'datadirectory'.*|'datadirectory' => '$OWNCLOUD_DATA_DIR',|g" $OWNCLOUD_PATH/config/config.php
         sed -i "s|'dbtype'.*|'dbtype' => '$OWNCLOUD_DBTYPE',|g" $OWNCLOUD_PATH/config/config.php
         sed -i "s|'dbname'.*|'dbname' => '$OWNCLOUD_DBNAME',|g" $OWNCLOUD_PATH/config/config.php
         sed -i "s|'dbhost'.*|'dbhost' => '$OWNCLOUD_DBHOST',|g" $OWNCLOUD_PATH/config/config.php
         sed -i "s|'dbuser'.*|'dbuser' => '$OWNCLOUD_DBUSER',|g" $OWNCLOUD_PATH/config/config.php
         sed -i "s|'dbpassword'.*|'dbpassword' => '$OWNCLOUD_DBPASS',|g" $OWNCLOUD_PATH/config/config.php
-        sed -i "s|'secret'.*|'secret' => '$OWNCLOUD_SECRET',|g" $OWNCLOUD_PATH/config/config.php
+        sed -i "s|'mail_domain'.*|'mail_domain' => '$DEFAULT_DOMAIN_NAME',|g" $OWNCLOUD_PATH/config/config.php
     fi
 
     echo 'install_owncloud_official_deb' >> $COMPLETION_FILE