diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 984700d415282fe584c1491600414ed823c44ef7..df13f65e384add5055dd624e1fec12507773c2b9 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -398,7 +398,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
           }
         } else {
           if (!empty($mail)){
-          	return false;
+            return false;
           }
         }
 
@@ -506,6 +506,11 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
           }
         }
 
+        // generate password if left empty and notification is on
+        if(!empty($_REQUEST['usernotify']) && empty($newpass)){
+            $newpass = auth_pwgen();
+        }
+
         if (!empty($newpass) && $this->_auth->canDo('modPass'))
           $changes['pass'] = $newpass;
         if (!empty($newname) && $this->_auth->canDo('modName') && $newname != $oldinfo['name'])