1 files changed, 8 insertions, 2 deletions
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index d4e3c58ac11..7bfc65102c1 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -8,8 +8,14 @@ OC_JSON::checkAdminUser();
 $username = $_POST["username"];
 
 //make sure the quota is in the expected format
-$quota= OC_Helper::computerFileSize($_POST["quota"]);
-$quota=OC_Helper::humanFileSize($quota);
+$quota=$_POST["quota"];
+if($quota!='none' and $quota!='default'){
+	$quota= OC_Helper::computerFileSize($quota);
+	$quota=OC_Helper::humanFileSize($quota);
+}
+if($quota==0){
+	$quota='default';
+}
 
 // Return Success story
 OC_Preferences::setValue($username,'files','quota',$quota);