diff --git a/settings/Application.php b/settings/Application.php
index 2f9b786d4388b..ca2b2b91f7195 100644
--- a/settings/Application.php
+++ b/settings/Application.php
@@ -96,16 +96,18 @@ public function __construct(array $urlParams=[]){
 				$c->query('Logger')
 			);
 		});
+
 		$container->registerService('AppSettingsController', function(IContainer $c) {
 			return new AppSettingsController(
 				$c->query('AppName'),
 				$c->query('Request'),
 				$c->query('L10N'),
 				$c->query('Config'),
-				$c->query('ICacheFactory'),
 				$c->query('INavigationManager'),
 				$c->query('IAppManager'),
-				$c->query('OcsClient')
+				$c->query('CategoryFetcher'),
+				$c->query('AppFetcher'),
+				\OC::$server->getL10NFactory()
 			);
 		});
 		$container->registerService('AuthSettingsController', function(IContainer $c) {
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index 77d65877ba342..58cc59f9848fe 100644
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -63,7 +63,7 @@ class UsersController extends Controller {
 	private $isAdmin;
 	/** @var IUserManager */
 	private $userManager;
-	/** @var \OC\Group\Manager */
+	/** @var IGroupManager */
 	private $groupManager;
 	/** @var IConfig */
 	private $config;
@@ -671,9 +671,6 @@ public function stats() {
 	 * @PasswordConfirmationRequired
 	 * @todo merge into saveUserSettings
 	 *
-	 * @NoAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
 	 * @param string $username
 	 * @param string $displayName
 	 * @return DataResponse
diff --git a/settings/js/federationscopemenu.js b/settings/js/federationscopemenu.js
index 36b720e8c45fe..066f648c104a0 100644
--- a/settings/js/federationscopemenu.js
+++ b/settings/js/federationscopemenu.js
@@ -46,8 +46,8 @@
 			this._scopes = [
 				{
 					name: 'private',
-					displayName: (this.field == 'avatar' || this.field == 'displayname') ? t('core', 'Local') : t('core', 'Private'),
-					tooltip: (this.field == 'avatar' || this.field == 'displayname') ? t('core', 'Only visible to local users') : t('core', 'Only visible to you'),
+					displayName: (this.field === 'avatar' || this.field === 'displayname') ? t('core', 'Local') : t('core', 'Private'),
+					tooltip: (this.field === 'avatar' || this.field === 'displayname') ? t('core', 'Only visible to local users') : t('core', 'Only visible to you'),
 					icon: OC.imagePath('core', 'actions/password'),
 					active: false
 				},