diff --git a/main/admin/user_add.php b/main/admin/user_add.php
index 75d9852ea6..03b1e4fef2 100755
--- a/main/admin/user_add.php
+++ b/main/admin/user_add.php
@@ -178,9 +178,20 @@ if (isset($extAuthSource) && count($extAuthSource) > 0) {
 
 $group[] = $form->createElement('radio', 'password_auto', get_lang('Password'), get_lang('AutoGeneratePassword').'<br />', 1);
 $group[] = $form->createElement('radio', 'password_auto', 'id="radio_user_password"', null, 0);
-$group[] = $form->createElement('password', 'password', null, array('id'=> 'password', 'autocomplete' => 'off', 'onkeydown' => 'javascript: password_switch_radio_button();'));
+$group[] = $form->createElement(
+    'password',
+    'password',
+    null,
+    array(
+        'id' => 'password',
+        'autocomplete' => 'off',
+        'onkeydown' => 'javascript: password_switch_radio_button();',
+        //'required' => 'required'
+    )
+);
 
 $form->addGroup($group, 'password', get_lang('Password'), '');
+$form->addGroupRule('password', 'password', 'required', null, 2);
 
 if ($checkPass) {
     $form->addElement('label', null, '<div id="password_progress" style="display:none"></div>');
@@ -228,7 +239,6 @@ if (api_is_platform_admin()) {
     $group = array();
     $group[] = $form->createElement('radio', 'platform_admin', 'id="id_platform_admin"', get_lang('Yes'), 1);
     $group[] = $form->createElement('radio', 'platform_admin', 'id="id_platform_admin"', get_lang('No'), 0);
-    //$display = ($_POST['status'] == STUDENT || !isset($_POST['status'])) ? 'none' : 'block';
     $form->addElement('html', '<div id="id_platform_admin" style="display:'.$display.';">');
     $form->addGroup($group, 'admin', get_lang('PlatformAdmin'), '&nbsp;');
     $form->addElement('html', '</div>');
diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php
index 22b5b2d25f..1567d43fbf 100755
--- a/main/admin/user_edit.php
+++ b/main/admin/user_edit.php
@@ -195,8 +195,14 @@ if (isset($extAuthSource) && !empty($extAuthSource) && count($extAuthSource) > 0
 $form->addElement('radio', 'reset_password', null, get_lang('AutoGeneratePassword'), 1);
 $group = array();
 $group[] =$form->createElement('radio', 'reset_password', null, null, 2);
-$group[] =$form->createElement('password', 'password', null, array('onkeydown' => 'javascript: password_switch_radio_button();'));
+$group[] = $form->createElement(
+    'password',
+    'password',
+    null,
+    array('onkeydown' => 'javascript: password_switch_radio_button();')
+);
 $form->addGroup($group, 'password', null, '', false);
+$form->addGroupRule('password', 'password', 'required', null, 2);
 
 // Status
 $status = array();
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index 92546bbcca..dc627a900f 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -275,6 +275,10 @@ class UserManager
             }
         }
 
+        if (empty($password)) {
+            return api_set_failure('ThisFieldIsRequired');
+        }
+
         $firstName = Security::remove_XSS($firstName);
         $lastName = Security::remove_XSS($lastName);
         $loginName = Security::remove_XSS($loginName);