diff --git a/dashboard/src/views/user-settings.html b/dashboard/src/views/user-settings.html
index c31c80849..f1abf5c2f 100644
--- a/dashboard/src/views/user-settings.html
+++ b/dashboard/src/views/user-settings.html
@@ -1,452 +1,3 @@
-<!-- Modal make user local -->
-<div class="modal fade" id="makeLocalModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">{{ 'users.makeLocalDialog.title' | tr }}</h4>
-      </div>
-      <div class="modal-body">
-        <p>{{ 'users.makeLocalDialog.description' | tr }}</p>
-        <p class="text-warning">{{ 'users.makeLocalDialog.warning' | tr }}</p>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-click="makeLocal.submit()" ng-disabled="makeLocal.busy"><i class="fa fa-circle-notch fa-spin" ng-show="makeLocal.busy"></i> {{ 'users.makeLocalDialog.submitAction' | tr }}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- Modal add user -->
-<div class="modal fade" id="userAddModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">{{ 'users.addUserDialog.title' | tr }}</h4>
-      </div>
-      <div class="modal-body">
-        <form name="useraddForm" role="form" ng-submit="useradd.submit()" autocomplete="off">
-          <div class="form-group" ng-class="{ 'has-error': (useraddForm.displayName.$dirty && useraddForm.displayName.$invalid) || (!useraddForm.displayName.$dirty && useradd.error.displayName) }">
-            <label class="control-label">{{ 'users.user.fullName' | tr }}</label>
-            <input type="text" class="form-control" ng-model="useradd.displayName" name="displayName" id="inputUserAddDisplayName" autofocus autocomplete="off" placeholder="{{ 'users.user.displayNamePlaceholder' | tr }}">
-            <div class="control-label" ng-show="(!useraddForm.displayName.$dirty && useradd.error.displayName) || (useraddForm.displayName.$dirty && useraddForm.displayName.$invalid) || (!useraddForm.displayName.$dirty && useradd.error.displayName)">
-              <small ng-show="useraddForm.displayName.$error.displayName">{{ 'users.user.errorNotValidFullName' | tr }}</small>
-              <small ng-show="!useraddForm.displayName.$dirty && useradd.error.displayName">{{ useradd.error.displayName }}</small>
-            </div>
-          </div>
-
-          <div class="form-group" ng-class="{ 'has-error': (useraddForm.email.$dirty && useraddForm.email.$invalid) || (!useraddForm.email.$dirty && useradd.error.email) }">
-            <label class="control-label">{{ 'users.user.primaryEmail' | tr }} <sup><a ng-href="https://docs.cloudron.io/profile/#primary-email" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></label>
-            <input type="email" class="form-control" ng-model="useradd.email" name="email" id="inputUserAddEmail" required>
-            <div class="control-label" ng-show="(!useraddForm.email.$dirty && useradd.error.email) || (useraddForm.email.$dirty && useraddForm.email.$invalid) || (!useraddForm.email.$dirty && useradd.error.email)">
-              <small ng-show="useraddForm.email.$error.required">{{ 'users.user.errorEmailRequired' | tr }}</small>
-              <small ng-show="useraddForm.email.$error.email">{{ 'users.user.errorInvalidEmail' | tr }}</small>
-              <small ng-show="!useraddForm.email.$dirty && useradd.error.email">{{ useradd.error.email }}</small>
-            </div>
-          </div>
-
-          <div class="form-group" ng-class="{ 'has-error': (useraddForm.fallbackEmail.$dirty && useraddForm.fallbackEmail.$invalid) || (!useraddForm.fallbackEmail.$dirty && useradd.error.fallbackEmail) }">
-            <label class="control-label">{{ 'users.user.recoveryEmail' | tr }} <sup><a ng-href="https://docs.cloudron.io/profile/#password-recovery-email" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></label>
-            <input type="email" class="form-control" ng-model="useradd.fallbackEmail" name="fallbackEmail" id="inputUserAddFallbackEmail" placeholder="{{ 'users.user.fallbackEmailPlaceholder' | tr }}">
-            <div class="control-label" ng-show="(!useraddForm.fallbackEmail.$dirty && useradd.error.fallbackEmail) || (useraddForm.fallbackEmail.$dirty && useraddForm.fallbackEmail.$invalid) || (!useraddForm.fallbackEmail.$dirty && useradd.error.fallbackEmail)">
-              <small ng-show="useraddForm.fallbackEmail.$error.required">{{ 'users.user.errorEmailRequired' | tr }}</small>
-              <small ng-show="useraddForm.fallbackEmail.$error.fallbackEmail">{{ 'users.user.errorInvalidEmail' | tr }}</small>
-              <small ng-show="!useraddForm.fallbackEmail.$dirty && useradd.error.fallbackEmail">{{ useradd.error.fallbackEmail }}</small>
-            </div>
-          </div>
-
-          <div class="form-group" ng-class="{ 'has-error': (useraddForm.username.$dirty && useraddForm.username.$invalid) || (!useraddForm.username.$dirty && useradd.error.username) }">
-            <label class="control-label">{{ 'users.user.username' | tr }}</label>
-            <input type="text" class="form-control" ng-model="useradd.username" name="username" id="inputUserAddUsername" ng-required="config.profileLocked" placeholder="{{ config.profileLocked ? '' : ('users.user.usernamePlaceholder' | tr) }}">
-            <div class="control-label" ng-show="(!useraddForm.username.$dirty && useradd.error.username) || (useraddForm.username.$dirty && useraddForm.username.$invalid) || (!useraddForm.username.$dirty && useradd.error.username)">
-              <small ng-show="useraddForm.username.$error.username">{{ 'users.user.errorInvalidUsername' | tr }}</small>
-              <small ng-show="!useraddForm.username.$dirty && useradd.error.username">{{ useradd.error.username }}</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">
-              <select class="form-control" ng-model="useradd.role" ng-options="role.id as role.name disable when role.disabled for role in roles"></select>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label class="control-label">{{ 'users.user.groups' | tr }}</label>
-            <div class="control-label">
-              <div ng-show="groups.length === 0">{{ 'users.user.noGroups' | tr }}</div>
-              <multiselect ng-show="groups.length !== 0" ng-model="useradd.selectedGroups" options="group.name for group in groups" data-compare-by="name" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
-            </div>
-          </div>
-
-          <div class="checkbox">
-            <label>
-              <input type="checkbox" ng-model="useradd.sendInvite" id="inputUserAddSendInvite"> {{ 'users.addUserDialog.sendInviteCheckbox' | tr }}
-            </label>
-          </div>
-
-          <input class="ng-hide" type="submit" ng-disabled="useraddForm.$invalid || useradd.busy"/>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-click="useradd.submit()" ng-disabled="useraddForm.$invalid || useradd.busy"><i class="fa fa-circle-notch fa-spin" ng-show="useradd.busy"></i> {{ 'users.addUserDialog.addUserAction' | tr }}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- Modal remove user -->
-<div class="modal fade" id="userRemoveModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">{{ 'users.deleteUserDialog.title' | tr:{ username: (userremove.userInfo.username || userremove.userInfo.email) } }}</h4>
-      </div>
-      <div class="modal-body">
-        <p class="text-bold text-danger" ng-show="userremove.error">{{ userremove.error }}</p>
-        <p ng-hide="userremove.error">{{ 'users.deleteUserDialog.description' | tr }}</p>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-danger" ng-click="userremove.submit()" ng-hide="userremove.error" ng-disabled="userremove.busy"><i class="fa fa-circle-notch fa-spin" ng-show="userremove.busy"></i> {{ 'users.deleteUserDialog.deleteAction' | tr }}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- Modal edit user -->
-<div class="modal fade" id="userEditModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">{{ 'users.editUserDialog.title' | tr:{ username: (useredit.userInfo.username || useredit.userInfo.email) } }}</h4>
-      </div>
-      <div class="modal-body">
-        <div ng-show="useredit.source">
-          <p class="text-warning">{{ 'users.editUserDialog.externalLdapWarning' | tr }}</p>
-          <p><label>{{ 'users.user.displayName' | tr }}</label><br/><input type="text" class="form-control" ng-disabled="true" ng-model="useredit.displayName">
-          <p><label>{{ 'users.user.email' | tr }}</label><br/><input type="text" class="form-control" ng-disabled="true" ng-model="useredit.email"></p>
-        </div>
-
-        <form name="useredit_form" role="form" ng-submit="useredit.submit()" autocomplete="off">
-          <p class="has-error text-center" ng-show="useredit.error.generic">{{ useredit.error.generic }}</p>
-
-          <!-- when user profiles are locked, this provides a way for the admin to set the username -->
-          <div class="form-group" ng-hide="useredit.source || useredit.userInfo.username" ng-class="{ 'has-error': (useredit_form.username.$dirty && useredit_form.username.$invalid) || (!useredit_form.username.$dirty && useredit.error.username) }">
-            <label class="control-label">{{ 'users.user.username' | tr }}</label>
-            <div class="control-label" ng-show="(!useredit_form.username.$dirty && useredit.error.username) || (useredit_form.username.$dirty && useredit_form.username.$invalid) || (!useredit_form.username.$dirty && useredit.error.username)">
-              <small ng-show="!useredit_form.username.$dirty && useredit.error.username">{{ useredit.error.username }}</small>
-            </div>
-            <input type="text" class="form-control" ng-model="useredit.username" name="username" autocomplete="off">
-          </div>
-          <div class="form-group" ng-hide="useredit.source" ng-class="{ 'has-error': (useredit_form.displayName.$dirty && useredit_form.displayName.$invalid) || (!useredit_form.displayName.$dirty && useredit.error.displayName) }">
-            <label class="control-label">{{ 'users.user.displayName' | tr }}</label>
-            <div class="control-label" ng-show="(!useredit_form.displayName.$dirty && useredit.error.displayName) || (useredit_form.displayName.$dirty && useredit_form.displayName.$invalid) || (!useredit_form.displayName.$dirty && useredit.error.displayName)">
-              <small ng-show="useredit_form.displayName.$error.required">{{ 'users.user.errorDisplayNameRequired' | tr }}</small>
-              <small ng-show="!useredit_form.displayName.$dirty && useredit.error.displayName">{{ useredit.error.displayName }}</small>
-            </div>
-            <input type="text" class="form-control" ng-model="useredit.displayName" name="displayName" required autofocus autocomplete="off">
-          </div>
-          <div class="form-group" ng-hide="useredit.source" ng-class="{ 'has-error': (useredit_form.email.$dirty && useredit_form.email.$invalid) || (!useredit_form.email.$dirty && useredit.error.email) }">
-            <label class="control-label">{{ 'users.user.primaryEmail' | tr }} <sup><a ng-href="https://docs.cloudron.io/profile/#primary-email" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></label>
-            <div class="control-label" ng-show="(!useredit_form.email.$dirty && useredit.error.email) || (useredit_form.email.$dirty && useredit_form.email.$invalid) || (!useredit_form.email.$dirty && useredit.error.email)">
-              <small ng-show="useredit_form.email.$error.required">{{ 'users.user.errorEmailRequired' | tr }}</small>
-              <small ng-show="useredit_form.email.$error.email">{{ 'users.user.errorInvalidEmail' | tr }}</small>
-              <small ng-show="!useredit_form.email.$dirty && useredit.error.email">{{ useredit.error.email }}</small>
-            </div>
-            <input type="email" class="form-control" ng-model="useredit.email" name="email" required>
-          </div>
-          <div class="form-group" ng-hide="useredit.source" ng-class="{ 'has-error': (useredit_form.fallbackEmail.$dirty && useredit_form.fallbackEmail.$invalid) || (!useredit_form.fallbackEmail.$dirty && useredit.error.fallbackEmail) }">
-            <label class="control-label">{{ 'users.user.recoveryEmail' | tr }} <sup><a ng-href="https://docs.cloudron.io/profile/#password-recovery-email" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></label>
-            <div class="control-label" ng-show="(!useredit_form.fallbackEmail.$dirty && useredit.error.fallbackEmail) || (useredit_form.fallbackEmail.$dirty && useredit_form.fallbackEmail.$invalid) || (!useredit_form.fallbackEmail.$dirty && useredit.error.fallbackEmail)">
-              <small ng-show="useredit_form.fallbackEmail.$error.fallbackEmail">{{ 'users.user.errorInvalidEmail' | tr }}</small>
-              <small ng-show="!useredit_form.fallbackEmail.$dirty && useredit.error.fallbackEmail">{{ useredit.error.fallbackEmail }}</small>
-            </div>
-            <input type="fallbackEmail" class="form-control" ng-model="useredit.fallbackEmail" name="fallbackEmail">
-          </div>
-          <div class="form-group" ng-show="!isMe(useredit.userInfo) && 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">
-              <select class="form-control" ng-model="useredit.role" ng-options="role.id as role.name disable when role.disabled for role in roles"></select>
-            </div>
-          </div>
-          <div class="form-group">
-            <label class="control-label">{{ 'users.user.groups' | tr }}</label>
-            <div class="control-label">
-              <div ng-show="groups.length === 0">{{ 'users.user.noGroups' | tr }}</div>
-              <multiselect ng-show="groups.length !== 0" ng-model="useredit.selectedGroups" options="group.name for group in groups" data-compare-by="id" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
-            </div>
-          </div>
-          <div class="form-group" ng-hide="isMe(useredit.userInfo)">
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" ng-model="useredit.active"> {{ 'users.user.activeCheckbox' | tr }} <sup><a ng-href="https://docs.cloudron.io/user-management/#disable-user" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup>
-              </label>
-            </div>
-          </div>
-          <input class="hide" type="submit" ng-disabled="useredit_form.$invalid || useredit.busy"/>
-        </form>
-        <hr/>
-        <div>
-          <p ng-hide="useredit.userInfo.twoFactorAuthenticationEnabled">{{ 'users.passwordResetDialog.no2FASetup' | tr }}</p>
-          <p ng-show="useredit.userInfo.twoFactorAuthenticationEnabled">{{ 'users.passwordResetDialog.2FAIsSetup' | tr }}</p>
-          <button type="button" class="btn btn-danger" ng-click="useredit.reset2FA()" ng-disabled="!useredit.userInfo.twoFactorAuthenticationEnabled || useredit.reset2FABusy"><i class="fa fa-circle-notch fa-spin" ng-show="useredit.reset2FABusy"></i> {{ 'users.passwordResetDialog.reset2FAAction' | tr }}</button>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-click="useredit.submit()" ng-disabled="useredit_form.$invalid || useredit.busy"><i class="fa fa-circle-notch fa-spin" ng-show="useredit.busy"></i> {{ 'main.dialog.save' | tr }}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- Modal add group -->
-<div class="modal fade" id="groupAddModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">{{ 'users.addGroupDialog.title' | tr }}</h4>
-      </div>
-      <div class="modal-body">
-        <form name="groupAddForm" role="form" novalidate ng-submit="groupAdd.submit()" autocomplete="off">
-          <div class="form-group" ng-class="{ 'has-error': (groupAddForm.name.$dirty && groupAddForm.name.$invalid) || (!groupAddForm.name.$dirty && groupAdd.error.name) }">
-            <label class="control-label" for="groupAddName">{{ 'users.group.name' | tr }}</label>
-            <div class="control-label" ng-show="(!groupAddForm.name.$dirty && groupAdd.error.name) || (groupAddForm.name.$dirty && groupAddForm.name.$invalid) || (!groupAddForm.name.$dirty && groupAdd.error.name)">
-              <small ng-show="groupAddForm.name.$error.required">{{ 'users.group.errorNameRequired' | tr }}</small>
-              <small ng-show="groupAddForm.name.$error.minlength">{{ 'users.group.errorNameTooShort' | tr }}</small>
-              <small ng-show="groupAddForm.name.$error.maxlength">{{ 'users.group.errorNameTooLong' | tr }}</small>
-              <small ng-show="!groupAddForm.name.$dirty && groupAdd.error.name">{{ groupAdd.error.name }}</small>
-            </div>
-            <input type="text" class="form-control" ng-model="groupAdd.name" id="groupAddName" name="name" ng-maxlength="200" ng-minlength="1" required autofocus>
-          </div>
-          <div class="form-group">
-            <label class="control-label">{{ 'users.group.users' | tr }}</label>
-            <div class="control-label">
-              <multiselect ng-model="groupAdd.selectedUsers" options="(user.username || user.email) for user in allUsers" data-compare-by="email" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
-            </div>
-          </div>
-          <input class="hide" type="submit" ng-disabled="groupAddForm.$invalid || groupAdd.busy"/>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-click="groupAdd.submit()" ng-disabled="groupAddForm.$invalid || groupAdd.busy"><i class="fa fa-circle-notch fa-spin" ng-show="groupAdd.busy"></i> {{ 'users.group.addGroupAction' | tr }}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- Modal edit group -->
-<div class="modal fade" id="groupEditModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">{{ 'users.editGroupDialog.title' | tr:{ name: groupEdit.groupInfo.name } }}</h4>
-      </div>
-      <div class="modal-body">
-        <p class="text-warning" ng-show="groupEdit.source">{{ 'users.editGroupDialog.externalLdapWarning' | tr }}</p>
-
-        <form name="groupEdit_form" role="form" ng-submit="groupEdit.submit()" autocomplete="off">
-          <div class="form-group" ng-class="{ 'has-error': groupEditForm.groupName.$invalid }">
-            <label class="control-label">{{ 'users.group.name' | tr }}</label>
-            <input type="text" class="form-control" ng-model="groupEdit.name" name="groupName" ng-disabled="groupEdit.busy || groupEdit.source" autofocus>
-          </div>
-          <div class="form-group">
-            <label class="control-label">{{ 'users.group.users' | tr }}</label>
-            <div class="control-label">
-              <multiselect ng-model="groupEdit.selectedUsers" options="(user.username || user.email) for user in allUsers" data-compare-by="email" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
-            </div>
-          </div>
-          <div class="form-group">
-            <label class="control-label">Access to Apps</label>
-            <div class="control-label">
-              <multiselect ng-model="groupEdit.selectedApps" options="(app.label || app.fqdn) for app in groupEdit.apps" data-compare-by="fqdn" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
-            </div>
-          </div>
-          <input class="hide" type="submit" ng-disabled="groupEdit_form.$invalid || useredit.busy"/>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-click="groupEdit.submit()" ng-disabled="groupEdit_form.$invalid || groupEdit.busy"><i class="fa fa-circle-notch fa-spin" ng-show="groupEdit.busy"></i> {{ 'main.dialog.save' | tr }}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- Modal remove group -->
-<div class="modal fade" id="groupRemoveModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">{{ 'users.deleteGroupDialog.title' | tr:{ name: groupRemove.group.name } }}</h4>
-      </div>
-      <div class="modal-body">
-        <div ng-show="groupRemove.memberCount" class="text-danger">
-          <b>{{ 'users.deleteGroupDialog.description' | tr:{ memberCount: groupRemove.memberCount } }}</b>
-          <br/>
-          <br/>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-danger" ng-click="groupRemove.submit()" ng-disabled="groupRemove.busy"><i class="fa fa-circle-notch fa-spin" ng-show="groupRemove.busy"></i> {{ 'users.deleteGroupDialog.deleteAction' | tr }}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- Modal user import -->
-<div class="modal fade" id="userImportModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">{{ 'users.userImportDialog.title' | tr }}</h4>
-      </div>
-      <div class="modal-body">
-        <div ng-show="!userImport.done">
-          <div ng-show="!userImport.busy">
-            <p ng-bind-html=" 'users.userImportDialog.description' | tr:{ docsLink: 'https://docs.cloudron.io/user-management/#import-users' } "></p>
-            <input type="file" style="display: none;" id="userImportFileInput" accept="application/json,text/csv"/>
-            <button class="btn btn-primary" ng-click="userImport.openFileInput()">{{ 'users.userImportDialog.fileInput' | tr }}</button>
-            <br/>
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" ng-model="userImport.sendInvite" id="inputUserImportSendInvite"> {{ 'users.userImportDialog.sendInviteCheckbox' | tr }}
-              </label>
-            </div>
-            <p class="text-danger" ng-show="userImport.error.file">{{ userImport.error.file }}</p>
-            <p class="text-info" ng-show="userImport.users.length">{{ 'users.userImportDialog.usersFound' | tr:{ count: userImport.users.length } }}</p>
-          </div>
-          <div ng-show="userImport.busy" class="progress progress-striped active">
-            <div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ userImport.percent }}%"></div>
-          </div>
-        </div>
-        <div ng-show="userImport.done">
-          <p>{{ 'users.userImportDialog.success' | tr:{ count: userImport.success } }}</p>
-          <div ng-show="userImport.error.import.length">
-            <p class="text-danger">{{ 'users.userImportDialog.failed' | tr }}</p>
-            <div ng-repeat="tmp in userImport.error.import"><b>{{ tmp.user.email }}:</b> {{ tmp.error.message }}</div>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
-        <button type="button" class="btn btn-primary" ng-click="userImport.import()" ng-show="!userImport.done" ng-disabled="userImport.busy || !userImport.users.length"><i class="fa fa-circle-notch fa-spin" ng-show="userImport.busy"></i> {{ 'users.userImportDialog.importAction' | tr }}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- Modal password reset -->
-<div class="modal fade" id="passwordResetModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">{{ 'users.passwordResetDialog.title' | tr:{ username: (passwordReset.user.username || passwordReset.user.email) } }}</h4>
-      </div>
-      <div class="modal-body">
-        <div class="form-group">
-          <label class="control-label">{{ 'users.passwordResetDialog.descriptionLink' | tr }}</label>
-          <div class="input-group">
-            <input type="text" id="passwordResetLinkInput" class="form-control" ng-value="passwordReset.resetLink" readonly/>
-            <span class="input-group-btn">
-              <button class="btn btn-primary" id="passwordResetLinkClipboardButton" type="button" data-clipboard-target="#passwordResetLinkInput"><i class="fa fa-clipboard"></i></button>
-            </span>
-          </div>
-        </div>
-        <br/>
-        <div class="form-group">
-          <label class="control-label">{{ 'users.passwordResetDialog.descriptionEmail' | tr }}</label>
-          <div class="input-group">
-            <input type="email" ng-change="passwordReset.emailError = null" class="form-control" ng-model="passwordReset.email"/>
-            <span class="input-group-btn">
-              <button type="button" class="btn btn-primary" ng-click="passwordReset.sendEmail()" ng-disabled="passwordReset.busy"><i class="fa fa-circle-notch fa-spin" ng-show="passwordReset.busy"></i> {{ 'users.passwordResetDialog.sendAction' | tr }}</button>
-            </span>
-          </div>
-        </div>
-        <div class="text-success text-small text-bold" ng-show="passwordReset.emailError === ''">{{ 'profile.passwordResetNotification.body' | tr:{ email: passwordReset.email } }}</div>
-        <div class="text-danger text-small text-bold" ng-show="passwordReset.emailError !== ''">{{ passwordReset.emailError }}</div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- Modal invitation -->
-<div class="modal fade" id="invitationModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">{{ 'users.invitationDialog.title' | tr:{ username: (invitation.user.username || invitation.user.email) } }}</h4>
-      </div>
-      <div class="modal-body">
-        <div class="form-group">
-          <label class="control-label">{{ 'users.invitationDialog.descriptionLink' | tr }}</label>
-          <div class="input-group">
-            <input type="text" id="invitationLinkInput" class="form-control" ng-value="invitation.inviteLink" readonly/>
-            <span class="input-group-btn">
-              <button class="btn btn-primary" id="invitationLinkClipboardButton" type="button" data-clipboard-target="#invitationLinkInput"><i class="fa fa-clipboard"></i></button>
-            </span>
-          </div>
-        </div>
-        <br/>
-        <div class="form-group">
-          <label class="control-label">{{ 'users.invitationDialog.descriptionEmail' | tr }}</label>
-          <div class="input-group">
-            <input type="email" class="form-control" ng-model="invitation.email"/>
-            <span class="input-group-btn">
-              <button type="button" class="btn btn-primary" ng-click="invitation.sendEmail()" ng-disabled="invitation.busy"><i class="fa fa-circle-notch fa-spin" ng-show="invitation.busy"></i> {{ 'users.invitationDialog.sendAction' | tr }}</button>
-            </span>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- Modal set ghost -->
-<div class="modal fade" id="setGhostModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">{{ 'users.setGhostDialog.title' | tr: { username: setGhost.user.username} }}</h4>
-      </div>
-      <div class="modal-body">
-        <p>{{ 'users.setGhostDialog.description' | tr }}</p>
-        <form name="setGhostForm" role="form" novalidate ng-submit="setGhost.submit()" autocomplete="off">
-          <div class="form-group" ng-class="{ 'has-error': setGhost.error }">
-            <label class="control-label" for="setGhostPassword">{{ 'users.setGhostDialog.password' | tr }}</label>
-            <div class="control-label" ng-show="setGhost.error">
-              <small ng-show="setGhost.error">{{ setGhost.error }}</small>
-            </div>
-            <div class="input-group">
-              <input type="text" id="setGhostPassword" class="form-control" name="ghostPassword" ng-model="setGhost.password" required ng-readonly="setGhost.success"/>
-              <span class="input-group-btn">
-                <button class="btn btn-default" ng-hide="setGhost.success" type="button" uib-tooltip="{{ 'users.setGhostDialog.generatePassword' | tr }}Generate Password" ng-click="setGhost.generatePassword()"><i class="fa fa-key"></i></button>
-                <button class="btn btn-default" ng-show="setGhost.success" type="button" id="setGhostClipboardButton" data-clipboard-target="#setGhostPassword"><i class="fa fa-clipboard"></i></button>
-              </span>
-            </div>
-          </div>
-          <input class="hide" type="submit" ng-disabled="setGhostForm.$invalid || setGhost.busy"/>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" ng-show="setGhost.success" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
-        <button type="button" class="btn btn-default" ng-hide="setGhost.success" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-hide="setGhost.success" ng-click="setGhost.submit()" ng-disabled="setGhostForm.$invalid || setGhost.busy"><i class="fa fa-circle-notch fa-spin" ng-show="setGhost.busy"></i> {{ 'users.setGhostDialog.setPassword' | tr }}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
 <!-- Modal external ldap -->
 <div class="modal fade" id="externalLdapModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
@@ -552,151 +103,10 @@
 
   <div class="text-left">
     <h1>
-      {{ 'users.title' | tr }}
+      {{ 'user.settings.title' | tr }}
     </h1>
   </div>
 
-  <div>
-    <div class="users-toolbar">
-      <input type="text" id="userSearchInput" class="form-control" style="max-width: 350px;" ng-model="userSearchString" ng-model-options="{ debounce: 1000 }" ng-change="updateFilter()" placeholder="{{ 'main.searchPlaceholder' | tr }}"/>
-      <multiselect ng-model="userStateFilter" ms-header="{{ 'apps.stateFilterHeader' | tr }}" ms-selected="{{ userStateFilter }}" options="state.label for state in userStates" data-multiple="false"></multiselect>
-      <div style="flex-grow: 1;"></div>
-      <div class="btn-group">
-        <button class="btn btn-default" ng-click="userImport.show()" uib-tooltip="{{ 'users.userImport.tooltip' | tr }}" tooltip-append-to-body="true"><i class="fas fa-download"></i></button>
-        <div class="btn-group" role="group">
-          <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" uib-tooltip="{{ 'users.userExport.tooltip' | tr }}" tooltip-append-to-body="true">
-            <i class="fas fa-upload"></i>
-          </button>
-          <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="" ng-click="userExport('csv')">{{ 'users.userExport.csv' | tr }}</a></li>
-            <li><a href="" ng-click="userExport('json')">{{ 'users.userExport.json' | tr }}</a></li>
-          </ul>
-        </div>
-      </div>
-      <button class="btn btn-primary btn-outline" ng-click="useradd.show()">
-        <i class="fa fa-user-plus"></i> {{ 'users.newUserAction' | tr }}
-      </button>
-    </div>
-    <div class="card card-large">
-      <div class="grid-item-top">
-        <div class="row ng-hide" ng-show="userRefreshBusy">
-          <div class="col-lg-12 text-center">
-            <h2><i class="fa fa-circle-notch fa-spin"></i></h2>
-          </div>
-        </div>
-        <div class="row ng-hide" ng-hide="userRefreshBusy">
-          <div class="col-lg-12">
-            <table class="table table-hover" style="margin: 0;">
-              <thead>
-                <tr>
-                  <th style="width: 0.5%;"></th>
-                  <th style="width:45%">{{ 'users.users.user' | tr }}</th>
-                  <th style="width:49.5%" class="hidden-xs hidden-sm">{{ 'users.users.groups' | tr }}</th>
-                  <th style="width: 5%" class="text-right">{{ 'main.actions' | tr }}</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr ng-show="users.length === 0">
-                  <td colspan="5" class="text-center text-muted">{{ 'users.users.empty' | tr }}</td>
-                </tr>
-                <tr ng-repeat="user in users" ng-class="{'text-muted': !user.active}">
-                  <td style="min-width: 33.5px;">
-                    <i class="fas fa-crown arrow" ng-show="user.active && user.role === 'owner'" uib-tooltip="{{ 'users.users.superadminTooltip' | tr }}"></i>
-                    <i class="fa fa-user-tie arrow" ng-show="user.active && user.role === 'admin'" uib-tooltip="{{ 'users.users.adminTooltip' | tr }}"></i>
-                    <i class="fas fa-users-cog arrow" ng-show="user.active && user.role === 'usermanager'" uib-tooltip="{{ 'users.users.usermanagerTooltip' | tr }}"></i>
-                    <i class="fas fa-mail-bulk arrow" ng-show="user.active && user.role === 'mailmanager'" uib-tooltip="{{ 'users.users.mailmanagerTooltip' | tr }}"></i>
-                    <i class="fa fa-ban" ng-show="!user.active" uib-tooltip="{{ 'users.users.inactiveTooltip' | tr }}"></i>
-                  </td>
-                  <td class="hand elide-table-cell" ng-click="canEdit(user) && useredit.show(user)" ng-show="user.username">
-                    {{ user.displayName }} &nbsp; <span class="text-muted">{{ user.username }}</span> &nbsp; <i ng-show="user.source" class="far fa-address-book" uib-tooltip="{{ 'users.users.externalLdapTooltip' | tr }}"></i>
-                  </td>
-                  <td class="hand elide-table-cell" ng-click="canEdit(user) && useredit.show(user)" ng-hide="user.username">
-                    <span class="text-muted" uib-tooltip="{{ 'users.users.notActivatedYetTooltip' | tr }}">{{ user.email }}</span>
-                  </td>
-                  <td class="text-left hand elide-table-cell hidden-xs hidden-sm" ng-click="canEdit(user) && useredit.show(user)">
-                    <span class="group-badge" ng-repeat="groupId in user.groupIds">
-                      {{ groupsById[groupId].name }}
-                    </span>
-                  </td>
-
-                  <td class="text-right no-wrap" style="vertical-align: bottom">
-                    <button ng-disabled="!canEdit(user)" ng-show="!user.inviteAccepted && !isMe(user) && !user.source" class="btn btn-xs btn-default" ng-click="invitation.show(user)" uib-tooltip="{{ 'users.users.invitationTooltip' | tr }}"><i class="fas fa-paper-plane"></i></button>
-                    <button ng-show="user.source" class="btn btn-xs btn-default" ng-click="makeLocal.show(user)" uib-tooltip="{{ 'users.users.makeLocalTooltip' | tr }}"><i class="fas fa-thumbtack" style="width: 10.5px;"></i></button>
-                    <button ng-disabled="!canEdit(user)" ng-show="user.inviteAccepted && !user.source" class="btn btn-xs btn-default" ng-click="passwordReset.show(user)" uib-tooltip="{{ 'users.users.resetPasswordTooltip' | tr }}"><i class="fas fa-key"></i></button>
-                    <button ng-disabled="!canImpersonate(user)" class="btn btn-xs btn-default" ng-click="setGhost.show(user)" uib-tooltip="{{ 'users.users.setGhostTooltip' | tr }}"><i class="fas fa-user-secret"></i></button>
-                    <button ng-disabled="!canEdit(user)" class="btn btn-xs btn-default" ng-click="useredit.show(user)" uib-tooltip="{{ 'users.users.editUserTooltip' | tr }}"><i class="fa fa-pencil-alt"></i></button>
-                    <button ng-disabled="!canEdit(user) || isMe(user)" class="btn btn-xs btn-danger" ng-click="userremove.show(user)" uib-tooltip="{{ 'users.users.removeUserTooltip' | tr }}"><i class="far fa-trash-alt"></i></button>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-            <br/>
-            <div class="pull-left">
-              {{ 'users.users.count' | tr:{ count: allUsers.length } }}
-            </div>
-            <div class="pull-right">
-              <button class="btn btn-default btn-outline btn-xs" ng-click="showPrevPage()" ng-class="{ 'btn-primary': currentPage > 1 }" ng-disabled="userRefreshBusy || currentPage <= 1"><i class="fa fa-angle-double-left"></i> {{ 'main.pagination.prev' | tr }}</button>
-                <span style="margin: 0 5px; line-height: 1.5; font-size: 12px;">{{ currentPage }}</span>
-              <button class="btn btn-default btn-outline btn-xs" ng-click="showNextPage()" ng-class="{ 'btn-primary': users.length > pageItems }" ng-disabled="userRefreshBusy || users.length < pageItems">{{ 'main.pagination.next' | tr }} <i class="fa fa-angle-double-right"></i></button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <br/>
-
-  <div class="text-left">
-    <h3 style="margin-bottom: 15px;">
-      {{ 'users.groups.title' | tr }}
-      <button class="btn btn-primary btn-outline pull-right" ng-click="groupAdd.show()">
-        <i class="fa fa-plus"></i> {{ 'users.groups.newGroupAction' | tr }}
-      </button>
-    </h3>
-  </div>
-
-  <div class="card card-large">
-    <div class="grid-item-top">
-      <div class="row ng-hide" ng-show="!ready">
-        <div class="col-lg-12 text-center">
-          <h2><i class="fa fa-circle-notch fa-spin"></i></h2>
-        </div>
-      </div>
-      <div class="row animateMeOpacity ng-hide" ng-show="ready">
-        <div class="col-lg-12">
-          <table class="table table-hover" style="margin: 0;">
-            <thead>
-              <tr>
-                <th style="width: 45%">{{ 'users.groups.name' | tr }}</th>
-                <th style="width: 49.5%" class="hidden-xs hidden-sm">{{ 'users.groups.users' | tr }}</th>
-                <th style="width: 5%" class="text-right">{{ 'main.actions' | tr }}</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr ng-repeat="group in groups">
-                <td class="hand elide-table-cell" style="text-overflow: ellipsis; white-space: nowrap;" ng-click="groupEdit.show(group)">
-                  {{ group.name }} &nbsp; <i ng-show="group.source" class="far fa-address-book" uib-tooltip="{{ 'users.groups.externalLdapTooltip' | tr }}"></i>
-                </td>
-                <td class="hand elide-table-cell" style="text-overflow: ellipsis; white-space: nowrap;" ng-click="groupEdit.show(group)">
-                  {{ groupMembers(group) }}
-                </td>
-                <td class="text-right no-wrap" style="vertical-align: bottom">
-                  <button class="btn btn-xs btn-default" ng-click="groupEdit.show(group)" uib-tooltip="Edit Group"><i class="fa fa-pencil-alt"></i></button>
-                  <button class="btn btn-xs btn-danger" ng-click="groupRemove.show(group)" uib-tooltip="Remove Group"><i class="far fa-trash-alt"></i></button>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </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">
diff --git a/dashboard/src/views/user-settings.js b/dashboard/src/views/user-settings.js
index 1222ca49b..1c991b2fc 100644
--- a/dashboard/src/views/user-settings.js
+++ b/dashboard/src/views/user-settings.js
@@ -2,8 +2,6 @@
 
 /* global angular */
 /* global Clipboard */
-/* global async */
-/* global ROLES */
 /* global $ */
 
 angular.module('Application').controller('UserSettingsController', ['$scope', '$location', '$translate', '$timeout', 'Client', function ($scope, $location, $translate, $timeout, Client) {
@@ -25,825 +23,8 @@ angular.module('Application').controller('UserSettingsController', ['$scope', '$
     });
 
     $scope.ready = false;
-    $scope.users = []; // users of current page
-    $scope.allUsersById = [];
-    $scope.groups = [];
-    $scope.groupsById = { };
     $scope.config = Client.getConfig();
     $scope.userInfo = Client.getUserInfo();
-    $scope.domains = [];
-
-    $scope.openSubscriptionSetup = function () {
-        Client.openSubscriptionSetup($scope.$parent.subscription);
-    };
-
-    $scope.roles = [];
-    $scope.allUsers = []; // all the users and not just current page, have to load this for group assignment
-
-    $scope.userSearchString = '';
-    $scope.currentPage = 1;
-    $scope.pageItems = localStorage.cloudronPageSize || 15;
-    $scope.userRefreshBusy = true;
-
-    $scope.userStates = [
-        { state: 'ALL', value: null, label: 'All Users' },
-        { state: 'ACTIVE', value: true, label: 'Active Users' },
-        { state: 'INACTIVE', value: false, label: 'Inactive Users' }
-    ];
-    $translate(['users.stateFilter.all', 'users.stateFilter.active', 'users.stateFilter.inactive']).then(function (tr) {
-        if (tr['users.stateFilter.all']) $scope.userStates.find(function (a) { return a.state === 'ALL'; }).label = tr['users.stateFilter.all'];
-        if (tr['users.stateFilter.active']) $scope.userStates.find(function (a) { return a.state === 'ACTIVE'; }).label = tr['users.stateFilter.active'];
-        if (tr['users.stateFilter.inactive']) $scope.userStates.find(function (a) { return a.state === 'INACTIVE'; }).label = tr['users.stateFilter.inactive'];
-    });
-
-    $scope.userStateFilter = $scope.userStates[0];
-    $scope.$watch('userStateFilter', function (newVal, oldVal) {
-        if (newVal === oldVal) return;
-        $scope.updateFilter();
-    });
-
-    $scope.groupMembers = function (group) {
-        return group.userIds.filter(function (uid) { return !!$scope.allUsersById[uid]; }).map(function (uid) { return $scope.allUsersById[uid].username || $scope.allUsersById[uid].email; }).join(' ');
-    };
-
-    $scope.canEdit = function (user) {
-        let roleInt1 = $scope.roles.findIndex(function (role) { return role.id === $scope.userInfo.role; });
-        let roleInt2 = $scope.roles.findIndex(function (role) { return role.id === user.role; });
-
-        return (roleInt1 - roleInt2) >= 0;
-    };
-
-    $scope.canImpersonate = function (user) {
-        // only admins can impersonate
-        if (!$scope.userInfo.isAtLeastAdmin) return false;
-
-        // only users with username can be impersonated
-        if (!user.username) return false;
-
-        // normal admins cannot impersonate owners
-        if (!$scope.userInfo.isAtLeastOwner && [ ROLES.OWNER ].indexOf(user.role) !== -1) return false;
-
-        return true;
-    };
-
-    $scope.userImport = {
-        busy: false,
-        done: false,
-        error: null,
-        percent: 0,
-        success: 0,
-        users: [],
-        sendInvite: false,
-
-        reset: function () {
-            $scope.userImport.busy = false;
-            $scope.userImport.error = null;
-            $scope.userImport.users = [];
-            $scope.userImport.percent = 0;
-            $scope.userImport.success = 0;
-            $scope.userImport.done = false;
-            $scope.userImport.sendInvite = false;
-        },
-
-        handleFileChanged: function () {
-            $scope.userImport.reset();
-
-            var fileInput = document.getElementById('userImportFileInput');
-            if (!fileInput.files || !fileInput.files[0]) return;
-
-            var file = fileInput.files[0];
-            if (file.type !== 'application/json' && file.type !== 'text/csv') return console.log('Unsupported file type.');
-
-            const reader = new FileReader();
-            reader.addEventListener('load', function () {
-                $scope.$apply(function () {
-                    $scope.userImport.users = [];
-                    var users = [];
-                    if (file.type === 'text/csv') {
-                        var lines = reader.result.split('\n');
-                        if (lines.length === 0) return $scope.userImport.error = { file: 'Imported file has no lines' };
-
-                        for (var i = 0; i < lines.length; i++) {
-                            var line = lines[i].trim();
-                            if (!line) continue;
-                            var items = line.split(',');
-                            if (items.length !== 5) {
-                                $scope.userImport.error = { file: 'Line ' + (i+1) + ' has wrong column count. Expecting 5' };
-                                return;
-                            }
-                            users.push({
-                                username: items[0].trim(),
-                                email: items[1].trim(),
-                                fallbackEmail: items[2].trim(),
-                                displayName: items[3].trim(),
-                                role: items[4].trim()
-                            });
-                        }
-                    } else {
-                        try {
-                            users = JSON.parse(reader.result).map(function (user) {
-                                return {
-                                    username: user.username,
-                                    email: user.email,
-                                    fallbackEmail: user.fallbackEmail,
-                                    displayName: user.displayName,
-                                    role: user.role
-                                };
-                            });
-                        } catch (e) {
-                            console.error('Failed to parse users.', e);
-                            $scope.userImport.error = { file: 'Imported file is not valid JSON:' + e.message };
-                        }
-                    }
-                    $scope.userImport.users = users;
-                });
-            }, false);
-            reader.readAsText(file);
-        },
-
-        show: function () {
-            $scope.userImport.reset();
-
-            // named so no duplactes
-            document.getElementById('userImportFileInput').addEventListener('change', $scope.userImport.handleFileChanged);
-
-            $('#userImportModal').modal('show');
-        },
-
-        openFileInput: function () {
-            $('#userImportFileInput').click();
-        },
-
-        import: function () {
-            $scope.userImport.percent = 0;
-            $scope.userImport.success = 0;
-            $scope.userImport.done = false;
-            $scope.userImport.error = { import: [] };
-            $scope.userImport.busy = true;
-
-            var processed = 0;
-
-            async.eachSeries($scope.userImport.users, function (user, callback) {
-                Client.addUser(user, function (error, userId) {
-                    if (error) $scope.userImport.error.import.push({ error: error, user: user });
-                    else ++$scope.userImport.success;
-
-                    ++processed;
-                    $scope.userImport.percent = 100 * processed / $scope.userImport.users.length;
-
-                    if (!error && $scope.userImport.sendInvite) {
-                        console.log('sending', userId, user.email);
-                        Client.sendInviteEmail(userId, user.email, function (error) {
-                            if (error) console.error('Failed to send invite.', error);
-                        });
-                    }
-
-                    callback();
-                });
-            }, function (error) {
-                if (error) return console.error(error);
-
-                $scope.userImport.busy = false;
-                $scope.userImport.done = true;
-                if ($scope.userImport.success) {
-                    refresh();
-                    refreshAllUsers();
-                }
-            });
-        }
-    };
-
-    // supported types are 'json' and 'csv'
-    $scope.userExport = function (type) {
-        Client.getAllUsers(function (error, result) {
-            if (error) {
-                Client.error('Failed to list users. Full error in the webinspector.');
-                return console.error('Failed to list users.', error);
-            }
-
-            var content = '';
-            if (type === 'json') {
-                content = JSON.stringify(result.map(function (user) {
-                    return {
-                        id: user.id,
-                        username: user.username,
-                        email: user.email,
-                        fallbackEmail: user.fallbackEmail,
-                        displayName: user.displayName,
-                        role: user.role,
-                        active: user.active
-                    };
-                }), null, 2);
-            } else if (type === 'csv') {
-                content = result.map(function (user) {
-                    return [ user.id, user.username, user.email, user.fallbackEmail, user.displayName, user.role, user.active ].join(',');
-                }).join('\n');
-            } else {
-                return;
-            }
-
-            var file = new Blob([ content ], { type: type === 'json' ? 'application/json' : 'text/csv' });
-            var a = document.createElement('a');
-            a.href = URL.createObjectURL(file);
-            a.download = type === 'json' ? 'users.json' : 'users.csv';
-            document.body.appendChild(a);
-            a.click();
-        });
-    };
-
-    $scope.userremove = {
-        busy: false,
-        error: null,
-        userInfo: {},
-
-        show: function (userInfo) {
-            $scope.userremove.error = null;
-            $scope.userremove.userInfo = userInfo;
-
-            $('#userRemoveModal').modal('show');
-        },
-
-        submit: function () {
-            $scope.userremove.busy = true;
-
-            Client.removeUser($scope.userremove.userInfo.id, function (error) {
-                $scope.userremove.busy = false;
-
-                if (error && error.statusCode === 403) return $scope.userremove.error = error.message;
-                else if (error) return console.error('Unable to delete user.', error);
-
-                $scope.userremove.userInfo = {};
-
-                refresh();
-                refreshAllUsers();
-
-                $('#userRemoveModal').modal('hide');
-            });
-        }
-    };
-
-    $scope.useradd = {
-        busy: false,
-        alreadyTaken: false,
-        error: {},
-        email: '',
-        fallbackEmail: '',
-        username: '',
-        displayName: '',
-        selectedGroups: [],
-        role: 'user',
-        sendInvite: false,
-
-        show: function () {
-            $scope.useradd.error = {};
-            $scope.useradd.email = '';
-            $scope.useradd.fallbackEmail = '';
-            $scope.useradd.username = '';
-            $scope.useradd.displayName = '';
-            $scope.useradd.selectedGroups = [];
-            $scope.useradd.role = 'user';
-            $scope.useradd.sendInvite = false;
-
-            $scope.useraddForm.$setUntouched();
-            $scope.useraddForm.$setPristine();
-
-            $('#userAddModal').modal('show');
-        },
-
-        submit: function () {
-            $scope.useradd.busy = true;
-
-            $scope.useradd.alreadyTaken = false;
-            $scope.useradd.error.email = null;
-            $scope.useradd.error.fallbackEmail = null;
-            $scope.useradd.error.username = null;
-            $scope.useradd.error.displayName = null;
-
-            var user = {
-                username: $scope.useradd.username || null,
-                email: $scope.useradd.email,
-                fallbackEmail: $scope.useradd.fallbackEmail,
-                displayName: $scope.useradd.displayName,
-                role: $scope.useradd.role
-            };
-
-            Client.addUser(user, function (error, userId) {
-                if (error) {
-                    $scope.useradd.busy = false;
-
-                    if (error.statusCode === 409) {
-                        if (error.message.toLowerCase().indexOf('email') !== -1) {
-                            $scope.useradd.error.email = 'Email already taken';
-                            $scope.useraddForm.email.$setPristine();
-                            $('#inputUserAddEmail').focus();
-                        } else if (error.message.toLowerCase().indexOf('username') !== -1 || error.message.toLowerCase().indexOf('mailbox') !== -1) {
-                            $scope.useradd.error.username = 'Username already taken';
-                            $scope.useraddForm.username.$setPristine();
-                            $('#inputUserAddUsername').focus();
-                        } else {
-                            // should not happen!!
-                            console.error(error.message);
-                        }
-                        return;
-                    } else if (error.statusCode === 400) {
-                        if (error.message.toLowerCase().indexOf('email') !== -1) {
-                            $scope.useradd.error.email = 'Invalid Email';
-                            $scope.useradd.error.emailAttempted = $scope.useradd.email;
-                            $scope.useraddForm.email.$setPristine();
-                            $('#inputUserAddEmail').focus();
-                        } else if (error.message.toLowerCase().indexOf('username') !== -1) {
-                            $scope.useradd.error.username = error.message;
-                            $scope.useraddForm.username.$setPristine();
-                            $('#inputUserAddUsername').focus();
-                        } else {
-                            console.error('Unable to create user.', error.statusCode, error.message);
-                        }
-                        return;
-                    } else {
-                        return console.error('Unable to create user.', error.statusCode, error.message);
-                    }
-                }
-
-                var groupIds = $scope.useradd.selectedGroups.map(function (g) { return g.id; });
-
-                Client.setGroups(userId, groupIds, function (error) {
-                    $scope.useradd.busy = false;
-
-                    if (error) return console.error(error);
-
-                    if ($scope.useradd.sendInvite) Client.sendInviteEmail(userId, user.email, function (error) { if (error) console.error('Failed to send invite.', error); });
-
-                    refresh();
-                    refreshAllUsers();
-
-                    $('#userAddModal').modal('hide');
-                });
-            });
-        }
-    };
-
-    $scope.useredit = {
-        busy: false,
-        reset2FABusy: false,
-        error: {},
-        userInfo: {},
-
-        // form fields
-        username: '',
-        email: '',
-        fallbackEmail: '',
-        aliases: {},
-        displayName: '',
-        active: false,
-        source: '',
-        selectedGroups: [],
-        role: '',
-
-        show: function (userInfo) {
-            $scope.useredit.error = {};
-            $scope.useredit.username = userInfo.username;
-            $scope.useredit.email = userInfo.email;
-            $scope.useredit.displayName = userInfo.displayName;
-            $scope.useredit.fallbackEmail = userInfo.fallbackEmail;
-            $scope.useredit.userInfo = userInfo;
-            $scope.useredit.selectedGroups = userInfo.groupIds.map(function (gid) { return $scope.groupsById[gid]; });
-            $scope.useredit.active = userInfo.active;
-            $scope.useredit.source = userInfo.source;
-            $scope.useredit.role = userInfo.role;
-
-            $scope.useredit_form.$setPristine();
-            $scope.useredit_form.$setUntouched();
-
-            $('#userEditModal').modal('show');
-        },
-
-        submit: function () {
-            $scope.useredit.error = {};
-            $scope.useredit.busy = true;
-
-            var userId = $scope.useredit.userInfo.id;
-            var data = {
-                id: userId
-            };
-
-            // only send if not the current active user
-            if (userId !== $scope.userInfo.id) {
-                data.active = $scope.useredit.active;
-                data.role = $scope.useredit.role;
-            }
-
-            // only change those if it is a local user
-            if (!$scope.useredit.source) {
-                // username is settable only if it was empty previously. it's editable for the "lock" profiles feature
-                if (!$scope.useredit.userInfo.username) data.username = $scope.useredit.username;
-                data.email = $scope.useredit.email;
-                data.displayName = $scope.useredit.displayName;
-                data.fallbackEmail = $scope.useredit.fallbackEmail;
-            }
-
-            Client.updateUser(data, function (error) {
-                if (error) {
-                    $scope.useredit.busy = false;
-
-                    if (error.statusCode === 409) {
-                        if (error.message.toLowerCase().indexOf('email') !== -1) {
-                            $scope.useredit.error.email = 'Email already taken';
-                        } else if (error.message.toLowerCase().indexOf('username') !== -1) {
-                            $scope.useredit.error.username = 'Username already taken';
-                        }
-                        $scope.useredit_form.email.$setPristine();
-                        $('#inputUserEditEmail').focus();
-                    } else {
-                        $scope.useredit.error.generic = error.message;
-                        console.error('Unable to update user:', error);
-                    }
-
-                    return;
-                }
-
-                var groupIds = $scope.useredit.selectedGroups.map(function (g) { return g.id; });
-
-                Client.setGroups(data.id, groupIds, function (error) {
-                    $scope.useredit.busy = false;
-
-                    if (error) return console.error('Unable to update groups for user:', error);
-
-                    refreshUsers(false);
-
-                    $('#userEditModal').modal('hide');
-                });
-            });
-        },
-
-        reset2FA: function () {
-            $scope.useredit.reset2FABusy = true;
-
-            Client.disableTwoFactorAuthenticationByUserId($scope.useredit.userInfo.id, function (error) {
-                if (error) return console.error(error);
-
-                $timeout(function () {
-                    $scope.useredit.userInfo.twoFactorAuthenticationEnabled = false;
-                    $scope.useredit.reset2FABusy = false;
-                }, 3000);
-            });
-        }
-    };
-
-    $scope.groupAdd = {
-        busy: false,
-        error: {},
-        name: '',
-        selectedUsers: [],
-
-        show: function () {
-            $scope.groupAdd.busy = false;
-
-            $scope.groupAdd.error = {};
-            $scope.groupAdd.name = '';
-
-            $scope.groupAddForm.$setUntouched();
-            $scope.groupAddForm.$setPristine();
-
-            $('#groupAddModal').modal('show');
-        },
-
-        submit: function () {
-            $scope.groupAdd.busy = true;
-            $scope.groupAdd.error = {};
-
-            Client.createGroup($scope.groupAdd.name, function (error, result) {
-                if (error) {
-                    $scope.groupAdd.busy = false;
-
-                    if (error.statusCode === 409) {
-                        $scope.groupAdd.error.name = 'Name already taken';
-                        $scope.groupAddForm.name.$setPristine();
-                        $('#groupAddName').focus();
-                        return;
-                    } else if (error.statusCode === 400) {
-                        $scope.groupAdd.error.name = error.message;
-                        $scope.groupAddForm.name.$setPristine();
-                        $('#groupAddName').focus();
-                        return;
-                    } else {
-                        return console.error('Unable to create group.', error.statusCode, error.message);
-                    }
-                }
-
-                var userIds = $scope.groupAdd.selectedUsers.map(function (u) { return u.id; });
-
-                Client.setGroupMembers(result.id, userIds, function (error) {
-                    $scope.groupAdd.busy = false;
-
-                    if (error) return console.error('Unable to add memebers.', error.statusCode, error.message);
-
-                    refresh();
-
-                    $('#groupAddModal').modal('hide');
-                });
-            });
-        }
-    };
-
-    $scope.groupEdit = {
-        busy: false,
-        error: {},
-        groupInfo: {},
-        name: '',
-        source: '',
-        selectedUsers: [],
-        selectedApps: [],
-        selectedAppsOriginal: [],
-        apps: [],
-
-        show: function (groupInfo) {
-            $scope.groupEdit.error = {};
-            $scope.groupEdit.groupInfo = groupInfo;
-            $scope.groupEdit.name = groupInfo.name;
-            $scope.groupEdit.source = groupInfo.source;
-            $scope.groupEdit.selectedUsers = groupInfo.userIds.map(function (uid) { return $scope.allUsersById[uid]; });
-            $scope.groupEdit.apps = Client.getInstalledApps();
-
-            $scope.groupEdit.selectedApps = Client.getInstalledApps().filter(function (app) {
-                if (app.accessRestriction === null || !Array.isArray(app.accessRestriction.groups)) return false;
-                return app.accessRestriction.groups.indexOf(groupInfo.id) !== -1;
-            });
-            angular.copy($scope.groupEdit.selectedApps, $scope.groupEdit.selectedAppsOriginal);
-
-            $scope.groupEdit_form.$setPristine();
-            $scope.groupEdit_form.$setUntouched();
-
-            $('#groupEditModal').modal('show');
-        },
-
-        submit: function () {
-            $scope.groupEdit.busy = true;
-            $scope.groupEdit.error = {};
-
-            Client.updateGroup($scope.groupEdit.groupInfo.id, $scope.groupEdit.name, function (error) {
-                if (error) {
-                    $scope.groupEdit.busy = false;
-
-                    if (error.statusCode === 409) {
-                        $scope.groupEdit.error.name = 'Name already taken';
-                        $scope.groupEditForm.name.$setPristine();
-                        $('#groupEditName').focus();
-                        return;
-                    } else if (error.statusCode === 400) {
-                        $scope.groupEdit.error.name = error.message;
-                        $scope.groupEditForm.name.$setPristine();
-                        $('#groupEditName').focus();
-                        return;
-                    } else {
-                        return console.error('Unable to edit group.', error.statusCode, error.message);
-                    }
-                }
-
-                var userIds = $scope.groupEdit.selectedUsers.map(function (u) { return u.id; });
-
-                Client.setGroupMembers($scope.groupEdit.groupInfo.id, userIds, function (error) {
-                    if (error) {
-                        $scope.groupEdit.busy = false;
-                        return console.error('Unable to set group members.', error.statusCode, error.message);
-                    }
-
-                    // find apps where ACL has changed
-                    var addedApps = $scope.groupEdit.selectedApps.filter(function (a) {
-                        return !$scope.groupEdit.selectedAppsOriginal.find(function (b) { return b.id === a.id; });
-                    });
-                    var removedApps = $scope.groupEdit.selectedAppsOriginal.filter(function (a) {
-                        return !$scope.groupEdit.selectedApps.find(function (b) { return b.id === a.id; });
-                    });
-
-                    async.eachSeries(addedApps, function (app, callback) {
-                        var accessRestriction = app.accessRestriction;
-                        if (!accessRestriction) accessRestriction = { users: [], groups: [] };
-                        if (!Array.isArray(accessRestriction.groups)) accessRestriction.groups = [];
-
-                        accessRestriction.groups.push($scope.groupEdit.groupInfo.id);
-
-                        Client.configureApp(app.id, 'access_restriction', { accessRestriction: accessRestriction }, callback);
-                    }, function (error) {
-                        if (error) {
-                            $scope.groupEdit.busy = false;
-                            return console.error('Unable to set added app access.', error.statusCode, error.message);
-                        }
-
-                        async.eachSeries(removedApps, function (app, callback) {
-                            var accessRestriction = app.accessRestriction;
-                            if (!accessRestriction) accessRestriction = { users: [], groups: [] };
-                            if (!Array.isArray(accessRestriction.groups)) accessRestriction.groups = [];
-
-                            var deleted = accessRestriction.groups.splice(accessRestriction.groups.indexOf($scope.groupEdit.groupInfo.id), 1);
-
-                            // if not found return early
-                            if (deleted.length === 0) return callback();
-
-                            Client.configureApp(app.id, 'access_restriction', { accessRestriction: accessRestriction }, callback);
-                        }, function (error) {
-                            $scope.groupEdit.busy = false;
-                            if (error) return console.error('Unable to set removed app access.', error.statusCode, error.message);
-
-                            refresh();
-
-                            // refresh apps to reflect change
-                            Client.refreshInstalledApps();
-
-                            $('#groupEditModal').modal('hide');
-                        });
-                    });
-                });
-            });
-        }
-    };
-
-    $scope.groupRemove = {
-        busy: false,
-        error: {},
-        group: null,
-        memberCount: 0,
-
-        show: function (group) {
-            $scope.groupRemove.busy = false;
-
-            $scope.groupRemove.error = {};
-
-            $scope.groupRemove.group = angular.copy(group);
-
-            Client.getGroup(group.id, function (error, result) {
-                if (error) return console.error('Unable to fetch group information.', error.statusCode, error.message);
-
-                $scope.groupRemove.memberCount = result.userIds.length;
-
-                $('#groupRemoveModal').modal('show');
-            });
-        },
-
-        submit: function () {
-            $scope.groupRemove.busy = true;
-            $scope.groupRemove.error = {};
-
-            Client.removeGroup($scope.groupRemove.group.id, function (error) {
-                $scope.groupRemove.busy = false;
-
-                if (error) return console.error('Unable to remove group.', error.statusCode, error.message);
-
-                refresh();
-                $('#groupRemoveModal').modal('hide');
-            });
-        }
-    };
-
-    $scope.isMe = function (user) {
-        return user.username === Client.getUserInfo().username;
-    };
-
-    $scope.passwordReset = {
-        busy: false,
-        resetLink: '',
-        user: null,
-        email: '',
-        emailError: null,
-
-        show: function (user) {
-            $scope.passwordReset.busy = false;
-            $scope.passwordReset.resetLink = '';
-            $scope.passwordReset.user = user;
-            $scope.passwordReset.email = user.fallbackEmail || user.email;
-            $scope.passwordReset.emailError = null;
-
-            Client.getPasswordResetLink(user.id, function (error, result) {
-                if (error) return console.error('Failed to get password reset link.', error);
-
-                $scope.passwordReset.resetLink = result.passwordResetLink;
-
-                $('#passwordResetModal').modal('show');
-            });
-        },
-
-        sendEmail: function () {
-            $scope.passwordReset.busy = true;
-            $scope.passwordReset.emailError = null;
-
-            Client.sendPasswordResetEmail($scope.passwordReset.user.id, $scope.passwordReset.email, function (error) {
-                $scope.passwordReset.busy = false;
-
-                if (error) {
-                    $scope.passwordReset.emailError = error.message;
-                } else {
-                    $scope.passwordReset.emailError = '';
-                }
-            });
-        }
-    };
-
-    $scope.makeLocal = {
-        busy: false,
-        user: null,
-
-        show: function (user) {
-            $scope.makeLocal.busy = false;
-            $scope.makeLocal.user = user;
-
-            $('#makeLocalModal').modal('show');
-        },
-
-        submit: function () {
-            $scope.makeLocal.busy = false;
-
-            Client.makeUserLocal($scope.makeLocal.user.id, function (error) {
-                if (error) return console.error('Failed to make user local.', error);
-
-                $scope.makeLocal.busy = false;
-
-                refreshUsers();
-
-                $('#makeLocalModal').modal('hide');
-            });
-        }
-    };
-
-    $scope.invitation = {
-        busy: false,
-        inviteLink: '',
-        user: null,
-        email: '',
-
-        show: function (user) {
-            $scope.invitation.busy = false;
-            $scope.invitation.inviteLink = '';
-            $scope.invitation.user = user;
-            $scope.invitation.email = user.email;
-
-            Client.getInviteLink(user.id, function (error, result) {
-                if (error) return console.error('Failed to get invite link.', error);
-
-                $scope.invitation.inviteLink = result.inviteLink;
-
-                $('#invitationModal').modal('show');
-            });
-        },
-
-        sendEmail: function () {
-            $scope.invitation.busy = true;
-
-            Client.sendInviteEmail($scope.invitation.user.id, $scope.invitation.email, function (error) {
-                if (error) return console.error('Failed to send invite email.', error);
-
-                $scope.invitation.busy = false;
-
-                Client.notify($translate.instant('users.invitationNotification.title'), $translate.instant('users.invitationNotification.body', { email: $scope.invitation.email }), false, 'success');
-            });
-        }
-    };
-
-    // https://stackoverflow.com/questions/1497481/javascript-password-generator
-    function generatePassword() {
-        var length = 12,
-            charset = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',
-            retVal = '';
-        for (var i = 0, n = charset.length; i < length; ++i) {
-            retVal += charset.charAt(Math.floor(Math.random() * n));
-        }
-        return retVal;
-    }
-
-    $scope.setGhost = {
-        busy: false,
-        error: null,
-        success: false,
-        user: null,
-        password: '',
-
-        show: function (user) {
-            $scope.setGhost.busy = false;
-            $scope.setGhost.success = false;
-            $scope.setGhost.error = null;
-            $scope.setGhost.user = user;
-            $scope.setGhost.password = '';
-
-            $('#setGhostModal').modal('show');
-        },
-
-        generatePassword: function () {
-            $scope.setGhost.password = generatePassword();
-        },
-
-        submit: function () {
-            $scope.setGhost.busy = true;
-
-            Client.setGhost($scope.setGhost.user.id, $scope.setGhost.password, null, function (error) {
-                $scope.setGhost.busy = false;
-
-                if (error) {
-                    $scope.setGhost.error = error.message;
-                    return console.error(error);
-                }
-
-                $scope.setGhost.success = true;
-            });
-        }
-    };
 
     $scope.profileConfig = {
         editableUserProfiles: true,
@@ -983,6 +164,15 @@ angular.module('Application').controller('UserSettingsController', ['$scope', '$
             });
         },
 
+        refresh: function() {
+            Client.getExternalLdapConfig(function (error, result) {
+                if (error) return console.error('Unable to get external ldap config.', error);
+
+                $scope.externalLdap.currentConfig = result;
+                $scope.externalLdap.checkStatus();
+            });
+        },
+
         updateStatus: function () {
             Client.getTask($scope.externalLdap.taskId, function (error, data) {
                 if (error) return window.setTimeout($scope.externalLdap.updateStatus, 5000);
@@ -992,10 +182,6 @@ angular.module('Application').controller('UserSettingsController', ['$scope', '$
                     $scope.externalLdap.message = '';
                     $scope.externalLdap.percent = 100; // indicates that 'result' is valid
                     $scope.externalLdap.errorMessage = data.success ? '' : data.error.message;
-
-                    refreshGroups();
-                    refreshUsers();
-
                     return;
                 }
 
@@ -1095,195 +281,16 @@ angular.module('Application').controller('UserSettingsController', ['$scope', '$
                     }
                 } else {
                     $('#externalLdapModal').modal('hide');
-
-                    loadExternalLdapConfig();
+                    $scope.externalLdap.refresh();
                 }
             });
         }
     };
 
-    function getUsers(callback) {
-        var users = [];
-
-        Client.getUsers($scope.userSearchString, $scope.userStateFilter.value, $scope.currentPage, $scope.pageItems, function (error, results) {
-            if (error) return console.error(error);
-
-            async.eachOf(results, function (result, index, iteratorDone) {
-                Client.getUser(result.id, function (error, user) {
-                    if (error) return iteratorDone(error);
-
-                    users[index] = user; // keep the sorting order
-
-                    iteratorDone();
-                });
-            }, function (error) {
-                callback(error, users);
-            });
-        });
-    }
-
-    function refreshUsers(showBusy) { // loads users on current page only
-        if (showBusy) $scope.userRefreshBusy = true;
-
-        getUsers(function (error, result) {
-            if (error) return console.error('Unable to get user listing.', error);
-
-            angular.copy(result, $scope.users);
-
-            $scope.ready = true;
-            $scope.userRefreshBusy = false;
-        });
-    }
-
-    function refreshGroups(callback) {
-        Client.getGroups(function (error, result) {
-            if (error) {
-                if (callback) return callback(error);
-                else return console.error('Unable to get group listing.', error);
-            }
-
-            angular.copy(result, $scope.groups);
-            $scope.groupsById = { };
-            for (var i = 0; i < result.length; i++) {
-                $scope.groupsById[result[i].id] = result[i];
-            }
-
-            if (callback) callback();
-        });
-    }
-
-    function refresh() {
-        refreshGroups(function (error) {
-            if (error) return console.error('Unable to get group listing.', error);
-            refreshUsers(true);
-        });
-    }
-
-    function loadExternalLdapConfig() {
-        Client.getExternalLdapConfig(function (error, result) {
-            if (error) return console.error('Unable to get external ldap config.', error);
-
-            $scope.externalLdap.currentConfig = result;
-            $scope.externalLdap.checkStatus();
-        });
-    }
-
-    $scope.showNextPage = function () {
-        $scope.currentPage++;
-        refreshUsers();
-    };
-
-    $scope.showPrevPage = function () {
-        if ($scope.currentPage > 1) $scope.currentPage--;
-        else $scope.currentPage = 1;
-        refreshUsers();
-    };
-
-    $scope.updateFilter = function () {
-        refreshUsers();
-    };
-
-    function refreshAllUsers() { // this loads all users on Cloudron, not just current page
-        Client.getAllUsers(function (error, results) {
-            if (error) return console.error(error);
-
-            $scope.allUsers = results;
-
-            $scope.allUsersById = {};
-            for (var i = 0; i < results.length; i++) {
-                $scope.allUsersById[results[i].id] = results[i];
-            }
-        });
-    }
-
-    function getAllDomains() {
-        Client.getDomains(function (error, domains) {
-            if (error) return console.error('Unable to get domains:', error);
-
-            $scope.domains = domains;
-        });
-    }
-
     Client.onReady(function () {
-        refresh();
-        if ($scope.user.isAtLeastAdmin) loadExternalLdapConfig();
-        if ($scope.user.isAtLeastAdmin) $scope.profileConfig.refresh();
-        if ($scope.user.isAtLeastAdmin) $scope.userDirectoryConfig.refresh();
-        if ($scope.user.isAtLeastAdmin) getAllDomains();
-        refreshAllUsers();
-
-        // Order matters for permissions used in canEdit
-        $scope.roles = [
-            { id: 'user', name: $translate.instant('users.role.user'), disabled: false },
-            { id: 'usermanager', name: $translate.instant('users.role.usermanager'), disabled: false },
-            { id: 'mailmanager', name: $translate.instant('users.role.mailmanager'), disabled: false },
-            { id: 'admin', name: $translate.instant('users.role.admin'), disabled: !$scope.user.isAtLeastAdmin },
-            { id: 'owner', name: $translate.instant('users.role.owner'), disabled: !$scope.user.isAtLeastOwner }
-        ];
-
-        // give search the initial focus
-        setTimeout(function () { $('#userSearchInput').focus(); }, 1);
-    });
-
-    // 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();
-        });
-    });
-
-    new Clipboard('#passwordResetLinkClipboardButton').on('success', function(e) {
-        $('#passwordResetLinkClipboardButton').tooltip({
-            title: 'Copied!',
-            trigger: 'manual'
-        }).tooltip('show');
-
-        $timeout(function () {  $('#passwordResetLinkClipboardButton').tooltip('hide'); }, 2000);
-
-        e.clearSelection();
-    }).on('error', function(/*e*/) {
-        $('#passwordResetLinkClipboardButton').tooltip({
-            title: 'Press Ctrl+C to copy',
-            trigger: 'manual'
-        }).tooltip('show');
-
-        $timeout(function () {  $('#passwordResetLinkClipboardButton').tooltip('hide'); }, 2000);
-    });
-
-    new Clipboard('#invitationLinkClipboardButton').on('success', function(e) {
-        $('#invitationLinkClipboardButton').tooltip({
-            title: 'Copied!',
-            trigger: 'manual'
-        }).tooltip('show');
-
-        $timeout(function () {  $('#invitationLinkClipboardButton').tooltip('hide'); }, 2000);
-
-        e.clearSelection();
-    }).on('error', function(/*e*/) {
-        $('#invitationLinkClipboardButton').tooltip({
-            title: 'Press Ctrl+C to copy',
-            trigger: 'manual'
-        }).tooltip('show');
-
-        $timeout(function () {  $('#invitationLinkClipboardButton').tooltip('hide'); }, 2000);
-    });
-
-    new Clipboard('#setGhostClipboardButton').on('success', function(e) {
-        $('#setGhostClipboardButton').tooltip({
-            title: 'Copied!',
-            trigger: 'manual'
-        }).tooltip('show');
-
-        $timeout(function () {  $('#setGhostClipboardButton').tooltip('hide'); }, 2000);
-
-        e.clearSelection();
-    }).on('error', function(/*e*/) {
-        $('#setGhostClipboardButton').tooltip({
-            title: 'Press Ctrl+C to copy',
-            trigger: 'manual'
-        }).tooltip('show');
-
-        $timeout(function () {  $('#setGhostClipboardButton').tooltip('hide'); }, 2000);
+        $scope.externalLdap.refresh();
+        $scope.profileConfig.refresh();
+        $scope.userDirectoryConfig.refresh();
     });
 
     new Clipboard('#userDirectoryUrlClipboardButton').on('success', function(e) {
diff --git a/dashboard/src/views/users.js b/dashboard/src/views/users.js
index bc101a73d..0c1f13f35 100644
--- a/dashboard/src/views/users.js
+++ b/dashboard/src/views/users.js
@@ -16,7 +16,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
     $scope.groupsById = { };
     $scope.config = Client.getConfig();
     $scope.userInfo = Client.getUserInfo();
-    $scope.domains = [];
 
     $scope.roles = [];
     $scope.allUsers = []; // all the users and not just current page, have to load this for group assignment
@@ -911,17 +910,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         });
     }
 
-    function getAllDomains() {
-        Client.getDomains(function (error, domains) {
-            if (error) return console.error('Unable to get domains:', error);
-
-            $scope.domains = domains;
-        });
-    }
-
     Client.onReady(function () {
         refresh();
-        if ($scope.user.isAtLeastAdmin) getAllDomains();
         refreshAllUsers();
 
         // Order matters for permissions used in canEdit