diff --git a/management/templates/index.html b/management/templates/index.html
index f6efda5c..2c0d5a9a 100644
--- a/management/templates/index.html
+++ b/management/templates/index.html
@@ -377,15 +377,6 @@ function show_panel(panelid) {
 }
 
 $(function() {
-    api(
-        "/system/default-quota",
-        "GET",
-        {},
-        function(r) {
-            $('#adduserQuota').val(r['default-quota']);
-        }
-    );
-
   // Recall saved user credentials.
   if (typeof sessionStorage != 'undefined' && sessionStorage.getItem("miab-cp-credentials"))
     api_credentials = sessionStorage.getItem("miab-cp-credentials").split(":");
diff --git a/management/templates/users.html b/management/templates/users.html
index 9e6899e0..9edbe421 100644
--- a/management/templates/users.html
+++ b/management/templates/users.html
@@ -39,6 +39,7 @@
   <li>Use <a href="#" onclick="return show_panel('aliases')">aliases</a> to create email addresses that forward to existing accounts.</li>
   <li>Administrators get access to this control panel.</li>
   <li>User accounts cannot contain any international (non-ASCII) characters, but <a href="#" onclick="return show_panel('aliases');">aliases</a> can.</li>
+  <li>Quotas may not contain any numbers or commas. Suffixes of G (gigabytes) and M (megabytes) are allowed.  For unlimited storage enter 0 (zero)</li>
 </ul>
 
 <h3>Existing mail users</h3>
@@ -141,6 +142,15 @@ curl -X POST -d "email=new_user@mydomail.com" https://{{hostname}}/admin/mail/us
 
 <script>
 function show_users() {
+  api(
+    "/system/default-quota",
+    "GET",
+    {},
+    function(r) {
+      $('#adduserQuota').val(r['default-quota']);
+    }
+  );
+
   $('#user_table tbody').html("<tr><td colspan='2' class='text-muted'>Loading...</td></tr>")
   api(
     "/mail/users",