diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index d00423a99f..9bbdd48e99 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -1048,21 +1048,6 @@ $(document).ready(function () {
 			}));
 			return false;
 		}
-		if ($.trim(password) === '' && !$('#CheckboxMailOnUserCreate').is(':checked')) {
-			OC.Notification.showTemporary(t('settings', 'Error creating user: {message}', {
-				message: t('settings', 'A valid password must be provided')
-			}));
-			return false;
-		}
-		if (!$('#CheckboxMailOnUserCreate').is(':checked')) {
-			email = '';
-		}
-		if ($('#CheckboxMailOnUserCreate').is(':checked') && $.trim(email) === '') {
-			OC.Notification.showTemporary(t('settings', 'Error creating user: {message}', {
-				message: t('settings', 'A valid email must be provided')
-			}));
-			return false;
-		}
 
 		var promise;
 		if (UserDeleteHandler) {
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
index 9e6866b196..5a37c968d1 100644
--- a/settings/templates/users/part.userlist.php
+++ b/settings/templates/users/part.userlist.php
@@ -33,7 +33,7 @@
 						autocomplete="off" autocapitalize="none" autocorrect="off" />
 				</td>
 				<td class="password">
-					<input id="newuserpassword" type="password" required
+					<input id="newuserpassword" type="password"
 						   placeholder="<?php p($l->t('Password'))?>" name="password"
 						   autocomplete="new-password" autocapitalize="none" autocorrect="off" />
 				</td>