diff --git a/scripts/restore b/scripts/restore
index 7ae947c..a5b9f54 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -66,33 +66,34 @@ ynh_script_progression --message="Restoring the logrotate configuration..." --we
 ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 
 # add some debugging to find #21
-ynh_exec_warn_less ls -lR /var/lib/couchdb /opt/couchdb/etc $install_dir /var/log/couchdb/couchdb.log \
+ls -lR /var/lib/couchdb /opt/couchdb/etc $install_dir /var/log/couchdb/couchdb.log \
   /var/log/$app/$app.log $data_dir /etc/nginx/conf.d/$domain.d/$app.conf || true
-ynh_exec_warn_less cat $install_dir/$app/flohmarkt.conf /opt/couchdb/etc/local.d/05-flohmarkt.ini
-ynh_exec_warn_less tail -n50 /var/log/couchdb/couchdb.log /var/log/$app/$app.log
+cat $install_dir/$app/flohmarkt.conf /opt/couchdb/etc/local.d/05-flohmarkt.ini
+tail -n50 /var/log/couchdb/couchdb.log /var/log/$app/$app.log || true
 
-# INTEGRATE SERVICE IN YUNOHOST
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
+# restore flohmarkt systemd service and integrate service into yunohost
+ynh_script_progression --message="Restoring flohmarkt.service and integrating service into YunoHost..." --weight=1
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
+ynh_systemd_action --action=enable
 yunohost service add $app --description="A decentral federated small advertisement platform" --log="/var/log/$app/$app.log"
 ynh_systemd_action --action=start --line_match="INFO:     Application startup complete."
 
 # add some debugging to find #21
-ynh_exec_warn_less systemctl status flohmarkt
-ynh_exec_warn_less systemctl status couchdb
+systemctl status flohmarkt
+systemctl status couchdb
 
 # RELOAD NGINX
 ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 ynh_systemd_action --service_name=nginx --action=reload
 
 # add some debugging to find #21
-ynh_exec_warn_less ps axuf
-ynh_exec_warn_less netstat -pnlt
-ynh_exec_warn_less cat /etc/nginx/conf.d/$domain.d/$app.conf
-ynh_exec_warn_less curl -D - "http://admin:$password_couchdb_admin@127.0.0.1:5984" || true
-ynh_exec_warn_less curl -D - "http://flohmarkt:$password_couchdb_flohmarkt@127.0.0.1:5984" || true
-ynh_exec_warn_less curl -D - "http://127.0.0.1:8000" || true
-ynh_exec_warn_less curl -D - "http://$domain" || true
-ynh_exec_warn_less curl -kD - "https://$domain" || true
+ps axuf
+netstat -pnlt
+cat /etc/nginx/conf.d/$domain.d/$app.conf
+curl -D - "http://admin:$password_couchdb_admin@127.0.0.1:5984" || true
+curl -D - "http://flohmarkt:$password_couchdb_flohmarkt@127.0.0.1:5984" || true
+curl -D - "http://127.0.0.1:8000" || true
+curl -D - "http://$domain" || true
+curl -kD - "https://$domain" || true
 
 ynh_script_progression --message="Restoration completed for $app" --last