diff --git a/scripts/remove b/scripts/remove
index f3e6ebe..b011da3 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -23,13 +23,6 @@ final_path=$(ynh_app_setting_get $app final_path)
 
 #=================================================
 # STANDARD REMOVE
-#=================================================
-# STOP AND REMOVE SERVICE
-#=================================================
-
-# Remove the dedicated systemd config
-ynh_remove_systemd_config
-
 #=================================================
 # REMOVE SERVICE FROM ADMIN PANEL
 #=================================================
@@ -41,6 +34,13 @@ then
 	yunohost service remove $app
 fi
 
+#=================================================
+# STOP AND REMOVE SERVICE
+#=================================================
+
+# Remove the dedicated systemd config
+ynh_remove_systemd_config
+
 #=================================================
 # REMOVE DEPENDENCIES
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 8dbba8a..d629496 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -91,12 +91,6 @@ ynh_restore_file "/etc/php5/fpm/pool.d/$app.conf"
 # Define and install dependencies
 ynh_install_app_dependencies deb1 deb2
 
-#=================================================
-# ADVERTISE SERVICE IN ADMIN PANEL
-#=================================================
-
-yunohost service add $app --log "/var/log/$app/APP.log"
-
 #=================================================
 # RESTORE SYSTEMD
 #=================================================
@@ -104,6 +98,12 @@ yunohost service add $app --log "/var/log/$app/APP.log"
 ynh_restore_file "/etc/systemd/system/$app.service"
 systemctl enable $app.service
 
+#=================================================
+# ADVERTISE SERVICE IN ADMIN PANEL
+#=================================================
+
+yunohost service add $app --log "/var/log/$app/APP.log"
+
 #=================================================
 # RESTORE THE CRON FILE
 #=================================================