diff --git a/src/translation/en.json b/src/translation/en.json
index 6c60aae64..cb7f4a9c8 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -241,8 +241,7 @@
             "primaryEmail": "Primary email",
             "recoveryEmail": "Password recovery email",
             "errorDisplayNameRequired": "Name is required",
-            "activeCheckbox": "User is active",
-            "passwordPlaceholder": "Optional. If provided, the admin can perform pre-setup tasks for the user."
+            "activeCheckbox": "User is active"
         },
         "deleteUserDialog": {
             "title": "Delete user {{ username }}",
diff --git a/src/views/users.html b/src/views/users.html
index ae39eac7d..76fd2c0a7 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -72,14 +72,6 @@
             </div>
           </div>
 
-          <div class="form-group" ng-show="useradd.username" ng-class="{ 'has-error': (useradd_form.password.$dirty && useradd_form.password.$invalid) || (!useradd_form.password.$dirty && useradd.error.password) }">
-            <label class="control-label">{{ 'users.user.password' | tr }}</label>
-            <input type="password" class="form-control" ng-model="useradd.password" name="password" id="inputUserAddPassword" placeholder="{{ 'users.user.passwordPlaceholder' | tr }}">
-            <div class="control-label" ng-show="(!useradd_form.password.$dirty && useradd.error.password) || (useradd_form.password.$dirty && useradd_form.password.$invalid) || (!useradd_form.password.$dirty && useradd.error.password)">
-              <small ng-show="!useradd_form.password.$dirty && useradd.error.password">{{ useradd.error.password }}</small>
-            </div>
-          </div>
-
           <div class="form-group" ng-show="userInfo.isAtLeastAdmin">
             <label class="control-label">{{ 'users.user.role' | tr }} <sup><a ng-href="https://docs.cloudron.io/user-management/#roles" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
             <div class="control-label">
diff --git a/src/views/users.js b/src/views/users.js
index a65082c56..d66c4afb8 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -127,7 +127,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         error: {},
         email: '',
         username: '',
-        password: '',
         displayName: '',
         selectedGroups: [],
         role: 'user',
@@ -141,7 +140,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.useradd.error = {};
             $scope.useradd.email = '';
             $scope.useradd.username = '';
-            $scope.useradd.password = '';
             $scope.useradd.displayName = '';
             $scope.useradd.selectedGroups = [];
             $scope.useradd.role = 'user';
@@ -158,12 +156,10 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.useradd.alreadyTaken = false;
             $scope.useradd.error.email = null;
             $scope.useradd.error.username = null;
-            $scope.useradd.error.password = null;
             $scope.useradd.error.displayName = null;
 
             var user = {
                 username: $scope.useradd.username || null,
-                password: $scope.useradd.password || null,
                 email: $scope.useradd.email,
                 displayName: $scope.useradd.displayName,
                 role: $scope.useradd.role
@@ -197,10 +193,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                             $scope.useradd.error.username = error.message;
                             $scope.useradd_form.username.$setPristine();
                             $('#inputUserAddUsername').focus();
-                        } else if (error.message.toLowerCase().indexOf('password') !== -1) {
-                            $scope.useradd.error.password = error.message;
-                            $scope.useradd_form.password.$setPristine();
-                            $('#inputUserAddPassword').focus();
                         } else {
                             console.error('Unable to create user.', error.statusCode, error.message);
                         }