diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 87f0c930064ae8ef3df311ecfb447bc183edf756..53d05028969b906d4e15f35af51212b75066e074 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -525,8 +525,8 @@ function web_admin_setup_login {
 
         # create a password file used by nginx
         echo -n "$webadmin_password" | htpasswd -i -s -c /etc/nginx/.webadminpasswd "admin"
-        if [ ! -f /etc/nginx/.webadminpasswd ]; then
-            echo $'/etc/nginx/.webadminpasswd not found'
+        if ! grep -q 'admin:' /etc/nginx/.webadminpasswd; then
+            echo $'/etc/nginx/.webadminpasswd password not created for admin'
             exit 2428956
         fi