diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 1439cfe373ab00156a04cf553509c0d2e074399d..bfab13a68c8817f7e9218b316637c0c8ce0ed4fd 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -10,7 +10,7 @@ $username = $_POST["username"];
 
 if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)){
 	$l = OC_L10N::get('core');
-	self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 	exit();
 }
 
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 55e936515ec58bec78a7ecc68796e0e2e4483cd9..2a30b1d97e6bf35cc61bc12258d14b906c0a0203 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -13,9 +13,9 @@ OCP\JSON::callCheck();
 
 $username = isset($_POST["username"])?$_POST["username"]:'';
 
-if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)){
+if(($username == '' && !OC_Group::inGroup(OC_User::getUser(), 'admin')) || (!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))){
 	$l = OC_L10N::get('core');
-	self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 	exit();
 }
 
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 649fce107dbbe5e529da5fd2b78957c649705313..9f246423d20bd29eae14397e79c18fb98f4b1d5d 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -32,7 +32,7 @@ $_['subadmingroups'] = array_flip($items);
 	<div class="quota">
 		<span><?php echo $l->t('Default Quota');?>:</span>
 		<div class="quota-select-wrapper">
-			<select class='quota'>
+			<select class='quota' <?php if(!(is_array($_['subadmins']) || $_['subadmins'])) echo 'disabled="disabled"'; ?>>
 				<?php foreach($_['quota_preset'] as $preset):?>
 				<?php if($preset!='default'):?>
 				<option