diff --git a/scripts/remove b/scripts/remove
index b209a6f..1532fdf 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -12,8 +12,8 @@ dbname=$app
 dbuser=$app
 
 # Drop MySQL database and user
-ynh_mysql_drop_db "$dbname" || true
-ynh_mysql_drop_user "$dbuser" || true
+ynh_mysql_drop_db "$dbname"
+ynh_mysql_drop_user "$dbuser"
 
 # Retrieve domain from app settings
 domain=$(ynh_app_setting_get "$app" domain)
@@ -27,11 +27,8 @@ rm -f "/etc/php5/fpm/pool.d/${app}.conf"
 ynh_remove_app_dependencies
 
 # Reload services
-service php5-fpm restart || true
-service nginx reload || true
+service php5-fpm restart
+service nginx reload
 
 # Remove the user account
-# (must be done after php-fpm restart)
-id "$app" >/dev/null 2>&1 \
-  && deluser --quiet --remove-home "$app" >/dev/null \
-  || true
+ynh_system_user_delete "$app"
diff --git a/scripts/restore b/scripts/restore
index e56308b..59b5100 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -52,11 +52,7 @@ else
     ynh_die "You must install Baïkal or Radicale before"
 fi
 
-if ! id -u $app > /dev/null 2>&1 ; then
-  useradd -c "$app system account" \
-    -d /var/www/$app --system --user-group $app --shell /usr/sbin/nologin \
-    || ynh_die "Unable to create $app system account"
-fi
+ynh_system_user_create "$app" "$final_path"
 
 # Restore the app files and set permissions
 cp -a ./sources "$DESTDIR"
diff --git a/scripts/upgrade b/scripts/upgrade
index 6205fbf..e540f74 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -128,5 +128,5 @@ then
 fi
 
 # Reload services
-service php5-fpm restart || true
-service nginx reload || true
+service php5-fpm restart
+service nginx reload