diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index f3c293d8..37bb85c4 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -42,6 +42,38 @@
             "account is inactive." | tr }}</em>
         </p>
 
+        {% if request.user.has_credential(creds.ACCOUNT_CHANGE_TYPE) %}
+            <p>
+                <label for="id_type">
+                    {% trans %}Account Type{% endtrans %}:
+                </label>
+                <select name="T" id="id_type">
+                    {% for value, type in account_types %}
+                        <option value="{{ value }}"
+                                {% if request.user.AccountType.ID == value %}
+                                selected="selected"
+                                {% endif %}
+                        >
+                            {{ type | tr }}
+                        </option>
+                    {% endfor %}
+
+                </select>
+            </p>
+
+            <p>
+                <label for="id_suspended">
+                    {% trans %}Account Suspended{% endtrans %}:
+                </label>
+
+                <input id="suspended" type="checkbox" name="S"
+                       {% if suspended %}
+                       checked="checked"
+                       {% endif %}
+                >
+            </p>
+        {% endif %}
+
         {% if request.user.is_elevated() %}
             <p>
                 <label for="id_inactive">{% trans %}Inactive{% endtrans %}:</label>
@@ -53,38 +85,6 @@
             </p>
         {% endif %}
 
-        {% if request.user.has_credential(creds.ACCOUNT_CHANGE_TYPE) %}
-		<p>
-            <label for="id_type">
-                {% trans %}Account Type{% endtrans %}:
-            </label>
-            <select name="T" id="id_type">
-                {% for value, type in account_types %}
-                    <option value="{{ value }}"
-                            {% if request.user.AccountType.ID == value %}
-                            selected="selected"
-                            {% endif %}
-                    >
-                        {{ type | tr }}
-                    </option>
-                {% endfor %}
-
-			</select>
-		</p>
-
-		<p>
-            <label for="id_suspended">
-                {% trans %}Account Suspended{% endtrans %}:
-            </label>
-
-            <input id="suspended" type="checkbox" name="S"
-                   {% if suspended %}
-                   checked="checked"
-                   {% endif %}
-            >
-		</p>
-        {% endif %}
-
         <!-- Email -->
         <p>
             <label for="id_email">