diff --git a/dashboard/src/index.html b/dashboard/src/index.html
index 77fff5838..50268a5ee 100644
--- a/dashboard/src/index.html
+++ b/dashboard/src/index.html
@@ -180,7 +180,7 @@
                         <li ng-show="user.isAtLeastOwner"><a href="#/branding"><i class="fa fa-passport fa-fw"></i> {{ 'branding.title' | tr }}</a></li>
                         <li ng-show="user.isAtLeastAdmin"><a href="#/domains"><i class="fa fa-globe fa-fw"></i> {{ 'domains.title' | tr }}</a></li>
                         <li ng-show="user.isAtLeastMailManager"><a href="#/email"><i class="fa fa-envelope fa-fw"></i> {{ 'emails.title' | tr }}</a></li>
-                        <li ng-show="user.isAtLeastAdmin"><a href="#/usersettings"><i class="fa fa-users-gear fa-fw"></i> {{ 'user.settings.title' | tr }}</a></li>
+                        <li ng-show="user.isAtLeastAdmin"><a href="#/usersettings"><i class="fa fa-users-gear fa-fw"></i> {{ 'users.settings.title' | tr }}</a></li>
                         <li ng-show="user.isAtLeastAdmin"><a href="#/eventlog"><i class="fa fa-list-alt fa-fw"></i> {{ 'eventlog.title' | tr }}</a></li>
                         <li ng-show="user.isAtLeastAdmin"><a href="#/network"><i class="fas fa-network-wired fa-fw"></i> {{ 'network.title' | tr }}</a></li>
                         <li ng-show="user.isAtLeastAdmin"><a href="#/services"><i class="fa fa-cogs fa-fw"></i> {{ 'services.title' | tr }}</a></li>
diff --git a/dashboard/src/views/users.html b/dashboard/src/views/users.html
index 383d575cc..e7aab9621 100644
--- a/dashboard/src/views/users.html
+++ b/dashboard/src/views/users.html
@@ -591,51 +591,4 @@
       </div>
     </div>
   </div>
-
-  <div class="text-left section-header" ng-show="user.isAtLeastAdmin">
-    <h3>{{ 'users.settings.title' | tr }}</h3>
-  </div>
-
-  <div class="card card-large" ng-show="user.isAtLeastAdmin">
-    <form name="profileConfigForm" role="form" novalidate ng-submit="profileConfig.submit()" autocomplete="off">
-      <fieldset ng-disabled="profileConfig.busy">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" ng-model="profileConfig.editableUserProfiles"> {{ 'users.settings.allowProfileEditCheckbox' | tr }} <sup><a ng-href="https://docs.cloudron.io/user-management/#lock-profile" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup>
-          </label>
-        </div>
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" ng-model="profileConfig.mandatory2FA"> {{ 'users.settings.require2FACheckbox' | tr }}
-          </label>
-        </div>
-      </fieldset>
-    </form>
-
-    <br/>
-
-    <div class="row">
-      <div class="col-md-12">
-        <span class="has-error" ng-show="profileConfig.errorMessage">{{ profileConfig.errorMessage }}</span>
-
-        <button class="btn btn-outline btn-primary pull-right" ng-click="profileConfig.submit()" ng-disabled="!profileConfigForm.$dirty || profileConfig.busy">
-          <i class="fa fa-circle-notch fa-spin" ng-show="profileConfig.busy"></i> {{ 'users.settings.saveAction' | tr }}
-        </button>
-      </div>
-    </div>
-
-  </div>
-
-  <div class="text-left section-header" ng-show="user.isAtLeastAdmin">
-    <h3>{{ 'oidc.title' | tr }}</h3>
-  </div>
-
-  <div class="card card-large" ng-show="user.isAtLeastAdmin">
-    <div class="row">
-      <div class="col-md-12" style="line-height: 34px;">
-        {{ 'oidc.description' | tr }}
-        <a href="/#/oidc" class="btn btn-outline btn-primary pull-right">{{ 'main.settings' | tr }}</a>
-      </div>
-    </div>
-  </div>
 </div>
diff --git a/dashboard/src/views/users.js b/dashboard/src/views/users.js
index 82774ee8a..bc101a73d 100644
--- a/dashboard/src/views/users.js
+++ b/dashboard/src/views/users.js
@@ -826,50 +826,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         }
     };
 
-    $scope.profileConfig = {
-        editableUserProfiles: true,
-        mandatory2FA: false,
-        errorMessage: '',
-
-        refresh: function () {
-            Client.getProfileConfig(function (error, result) {
-                if (error) return console.error('Unable to get profile config.', error);
-
-                $scope.profileConfig.editableUserProfiles = !result.lockUserProfiles;
-                $scope.profileConfig.mandatory2FA = !!result.mandatory2FA;
-            });
-        },
-
-        submit: function () {
-            // prevent the current user from getting locked out
-            if ($scope.profileConfig.mandatory2FA && !$scope.userInfo.twoFactorAuthenticationEnabled) return Client.notify('', $translate.instant('users.settings.require2FAWarning'), true, 'error', '#/profile');
-
-            $scope.profileConfig.error = '';
-            $scope.profileConfig.busy = true;
-            $scope.profileConfig.success = false;
-
-            var data = {
-                lockUserProfiles: !$scope.profileConfig.editableUserProfiles,
-                mandatory2FA: $scope.profileConfig.mandatory2FA
-            };
-
-            Client.setProfileConfig(data, function (error) {
-                if (error) $scope.profileConfig.errorMessage = error.message;
-
-                $scope.profileConfig.success = true;
-
-                $scope.profileConfigForm.$setUntouched();
-                $scope.profileConfigForm.$setPristine();
-
-                Client.refreshConfig(); // refresh the $scope.config
-
-                $timeout(function () {
-                    $scope.profileConfig.busy = false;
-                }, 500);
-            });
-        }
-    };
-
     function getUsers(callback) {
         var users = [];
 
@@ -965,7 +921,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
     Client.onReady(function () {
         refresh();
-        if ($scope.user.isAtLeastAdmin) $scope.profileConfig.refresh();
         if ($scope.user.isAtLeastAdmin) getAllDomains();
         refreshAllUsers();
 
@@ -985,7 +940,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
     // setup all the dialog focus handling
     ['userAddModal', 'userRemoveModal', 'userEditModal', 'groupAddModal', 'groupEditModal', 'groupRemoveModal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
-            $(this).find("[autofocus]:first").focus();
+            $(this).find('[autofocus]:first').focus();
         });
     });