diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 78118d5c5a..4ce7764882 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -584,7 +584,7 @@ var UserList = {
 		if (quota === 'other') {
 			return;
 		}
-		if (isNaN(parseInt(quota, 10)) || parseInt(quota, 10) < 0) {
+		if ((quota !== 'default' && quota !=="none") && (isNaN(parseInt(quota, 10)) || parseInt(quota, 10) < 0)) {
 			// the select component has added the bogus value, delete it again
 			$select.find('option[selected]').remove();
 			OC.Notification.showTemporary(t('core', 'Invalid quota value "{val}"', {val: quota}));