1 files changed, 9 insertions, 11 deletions
diff --git a/admin/themes/default/template/profile_content.tpl b/admin/themes/default/template/profile_content.tpl
index 8c0e913ad..24cf53abe 100644
--- a/admin/themes/default/template/profile_content.tpl
+++ b/admin/themes/default/template/profile_content.tpl
@@ -5,24 +5,22 @@
     <input type="hidden" name="redirect" value="{$REDIRECT}">
     <ul>
       <li>
-        <span class="property">{'Username'|@translate}</span>
+        <span class="property">
+          <label for="username">{'Username'|@translate}</label>
+        </span>
+      {if not $SPECIAL_USER}
+        <input type="text" name="username" id="username" value="{$USERNAME}">
+      {else}
         {$USERNAME}
+      {/if}
       </li>
-{if not $SPECIAL_USER} {* can modify password + email*}
+    {if not $SPECIAL_USER} {* can modify password + email*}
       <li>
         <span class="property">
           <label for="mail_address">{'Email address'|@translate}</label>
         </span>
         <input type="text" name="mail_address" id="mail_address" value="{$EMAIL}">
       </li>
-{if not $IN_ADMIN} {* admins do not need old password*}
-      <li>
-        <span class="property">
-          <label for="password">{'Password'|@translate}</label>
-        </span>
-        <input type="password" name="password" id="password" value="">
-      </li>
-{/if}
       <li>
         <span class="property">
           <label for="use_new_pwd">{'New password'|@translate}</label>
@@ -35,7 +33,7 @@
         </span>
         <input type="password" name="passwordConf" id="passwordConf" value="">
       </li>
-{/if}
+    {/if}
     </ul>
   </fieldset>