diff --git a/static/templates/settings/account-settings.handlebars b/static/templates/settings/account-settings.handlebars
index 44c6b0c25c..5778a0175d 100644
--- a/static/templates/settings/account-settings.handlebars
+++ b/static/templates/settings/account-settings.handlebars
@@ -40,6 +40,49 @@
                 </div>
             </form>
 
+            <form class="form-horizontal full-name-change-form">
+                <div class="inline-block grid user-name-parent">
+                    <div class="user-name-section inline-block">
+                        <label for="full_name" class="inline-block title">{{t "Full name" }}</label>
+                        <a id="change_full_name" {{#if page_params.realm_name_changes_disabled}}href="#change_name" {{/if}}>
+                            <button type="button" class="button small white rounded inline-block" id="full_name"{{#if page_params.realm_name_changes_disabled}} disabled="disabled"{{/if}}>
+                                <span id="full_name_value">{{page_params.full_name}}</span>
+                                <i class="fa fa-pencil"></i>
+                            </button>
+                        </a>
+                        <i class="icon-vector-question-sign change_name_tooltip" data-toggle="tooltip"
+                        {{#unless page_params.realm_name_changes_disabled}}style="display:none" {{/unless}}
+                        title="{{t 'Changing your name has been disabled by your Zulip organization administrators. Contact an administrator for help.' }}"/>
+                    </div>
+                    <div id="change_full_name_modal" class="modal hide" tabindex="-1" role="dialog"
+                        aria-labelledby="change_full_name_modal_label" aria-hidden="true">
+                        <div class="modal-header">
+                            <button type="button" class="close" data-dismiss="modal" aria-label="{{t 'Close' }}"><span aria-hidden="true">&times;</span></button>
+                            <h3 id="change_full_name_modal_label">{{t "Change full name" }}</h3>
+                        </div>
+                        <div class="modal-body">
+                            <div class="input-group full_name_change_container">
+                                <label for="email">{{t "New full name" }}</label>
+                                <input type="text" name="full_name" value="{{ page_params.full_name }}" autocomplete="off" spellcheck="false" autofocus="autofocus"/>
+                            </div>
+                        </div>
+                        <div class="alert change_full_name_info"></div>
+                        <div class="modal-footer">
+                            <button class="button white rounded" type="button" data-dismiss="modal">{{t "Cancel" }}</button>
+                            <button id='change_full_name_button' class="button rounded sea-green" data-dismiss="modal">{{t "Change" }}</button>
+                        </div>
+                    </div>
+                    <div class="input-group">
+                        <div class="input-group">
+                            <label for="" class="inline-block"></label>
+                            <button type="submit" class="button rounded w-200 btn-danger input-size" id="user_deactivate_account_button">
+                                {{t 'Deactivate account' }}
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </form>
+
             <form class="password-change-form grid">
                 <div class="input-group user-name-section">
                     <label class="inline-block title">{{t "Password" }}</label>
@@ -84,49 +127,6 @@
                     </div>
                 </div>
             </form>
-
-            <form class="form-horizontal full-name-change-form">
-                <div class="inline-block grid user-name-parent">
-                    <div class="user-name-section inline-block">
-                        <label for="full_name" class="inline-block title">{{t "Full name" }}</label>
-                        <a id="change_full_name" {{#if page_params.realm_name_changes_disabled}}href="#change_name" {{/if}}>
-                            <button type="button" class="button small white rounded inline-block" id="full_name"{{#if page_params.realm_name_changes_disabled}} disabled="disabled"{{/if}}>
-                                <span id="full_name_value">{{page_params.full_name}}</span>
-                                <i class="fa fa-pencil"></i>
-                            </button>
-                        </a>
-                        <i class="icon-vector-question-sign change_name_tooltip" data-toggle="tooltip"
-                        {{#unless page_params.realm_name_changes_disabled}}style="display:none" {{/unless}}
-                        title="{{t 'Changing your name has been disabled by your Zulip organization administrators. Contact an administrator for help.' }}"/>
-                    </div>
-                    <div id="change_full_name_modal" class="modal hide" tabindex="-1" role="dialog"
-                        aria-labelledby="change_full_name_modal_label" aria-hidden="true">
-                        <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal" aria-label="{{t 'Close' }}"><span aria-hidden="true">&times;</span></button>
-                            <h3 id="change_full_name_modal_label">{{t "Change full name" }}</h3>
-                        </div>
-                        <div class="modal-body">
-                            <div class="input-group full_name_change_container">
-                                <label for="email">{{t "New full name" }}</label>
-                                <input type="text" name="full_name" value="{{ page_params.full_name }}" autocomplete="off" spellcheck="false" autofocus="autofocus"/>
-                            </div>
-                        </div>
-                        <div class="alert change_full_name_info"></div>
-                        <div class="modal-footer">
-                            <button class="button white rounded" type="button" data-dismiss="modal">{{t "Cancel" }}</button>
-                            <button id='change_full_name_button' class="button rounded sea-green" data-dismiss="modal">{{t "Change" }}</button>
-                        </div>
-                    </div>
-                    <div class="input-group">
-                        <div class="input-group">
-                            <label for="" class="inline-block"></label>
-                            <button type="submit" class="button rounded w-200 btn-danger input-size" id="user_deactivate_account_button">
-                                {{t 'Deactivate account' }}
-                            </button>
-                        </div>
-                    </div>
-                </div>
-            </form>
         </div>
 
         <div class="inline-block user-avatar-section">