diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 557b6302b327b2c03d36c6336198f9a3ae01ab33..cde6916129e2dd0f7811048d44502bfbd9bb1685 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -450,10 +450,21 @@ function web_admin_onion_only {
     sed -i 's|onion_only=false;|onion_only=true;|g' "/var/www/${local_hostname}/htdocs/admin/installapp.php"
 }
 
+function web_admin_setup_login {
+    read_config_param MY_USERNAME
+    webadmin_password=$("${PROJECT_NAME}-pass" -u "$MY_USERNAME" -a webadmin)
+    if [ ! "$webadmin_password" ]; then
+        webadmin_password="$(create_password "${MINIMUM_PASSWORD_LENGTH}")"
+        "${PROJECT_NAME}-pass" -u "$MY_USERNAME" -a webadmin -p "$webadmin_password"
+    fi
+}
+
 function install_web_admin {
     # This is intended as an admin web user interface
     # similar to Plinth or the yunohost
 
+    web_admin_setup_login
+
     language_subdir=$(web_admin_get_language_subdir)
 
     local_hostname=$(grep 'host-name' /etc/avahi/avahi-daemon.conf | awk -F '=' '{print $2}').local