diff --git a/management/cli.py b/management/cli.py
index f01c8062..457901de 100755
--- a/management/cli.py
+++ b/management/cli.py
@@ -89,9 +89,7 @@ elif sys.argv[1] == "user" and len(sys.argv) == 2:
 			print(user['email'], end='')
 			if "admin" in user['privileges']:
 				print("*", end='')
-			if user['quota'] == '0':
-				print(" unlimited", end='')
-			else:
+			if 'quota' in user:
 				print(" " + user['quota'], end='')
 			print()