diff --git a/apps/users/templates/users/_user.html b/apps/users/templates/users/_user.html
index b33abce51..fe76954f0 100644
--- a/apps/users/templates/users/_user.html
+++ b/apps/users/templates/users/_user.html
@@ -11,8 +11,8 @@
     <form method="post" class="form-horizontal" action="" enctype="multipart/form-data">
         {% csrf_token %}
         <h3>{% trans 'Account' %}</h3>
-        {% bootstrap_field form.username layout="horizontal" %}
         {% bootstrap_field form.name layout="horizontal" %}
+        {% bootstrap_field form.username layout="horizontal" %}
         {% bootstrap_field form.email layout="horizontal" %}
         {% bootstrap_field form.groups layout="horizontal" %}
 
@@ -32,12 +32,6 @@
                 <span class="help-block ">{{ form.date_expired.errors }}</span>
             </div>
          </div>
-{#        <div class="form-group">#}
-{#            <label for="{{ form.enable_otp.id_for_label }}" class="col-sm-2 control-label">{% trans 'Enable OTP' %}</label>#}
-{#            <div class="col-sm-8">#}
-{#                {{ form.enable_otp }}#}
-{#            </div>#}
-{#        </div>#}
         <div class="hr-line-dashed"></div>
         <h3>{% trans 'Profile' %}</h3>
         {% bootstrap_field form.phone layout="horizontal" %}