diff --git a/src/freedombone-app-ghost b/src/freedombone-app-ghost
index 76c1ebc9..bc08ec15 100755
--- a/src/freedombone-app-ghost
+++ b/src/freedombone-app-ghost
@@ -223,10 +223,6 @@ function restore_local_ghost {
         GHOST_DOMAIN_NAME=$(get_completion_param "ghost domain")
     fi
     if [ $GHOST_DOMAIN_NAME ]; then
-        function_check get_mariadb_password
-        get_mariadb_password
-        DATABASE_PASSWORD=$MARIADB_PASSWORD
-
         systemctl stop ghost
 
         function_check ghost_create_database
@@ -236,9 +232,7 @@ function restore_local_ghost {
         restore_database ghost ${GHOST_DOMAIN_NAME}
 
         systemctl start ghost
-
-        DATABASE_PASSWORD=
-        MARIADB_PASSWORD=
+        restart_site
     fi
 }
 
@@ -266,6 +260,8 @@ function restore_remote_ghost {
         GHOST_DOMAIN_NAME=$(get_completion_param "ghost domain")
     fi
 
+    systemctl stop ghost
+
     function_check get_mariadb_password
     get_mariadb_password
 
@@ -275,6 +271,7 @@ function restore_remote_ghost {
     ghost_create_database
 
     restore_database_from_friend ghost ${GHOST_DOMAIN_NAME}
+    systemctl start ghost
     restart_site
     chown -R ghost: /var/www/$GHOST_DOMAIN_NAME/htdocs/
 }