diff --git a/templates/default/account-password.html b/templates/default/account-password.html
index a60a2f72a..5b14ac1f6 100644
--- a/templates/default/account-password.html
+++ b/templates/default/account-password.html
@@ -14,9 +14,6 @@
 
 {block name="main-content"}
 
-    {* Used to display the success icon *}
-    {assign var="isPost" value="{$smarty.post|count}"}
-
     <div class="main">
 
         <article class="col-main" role="main" aria-labelledby="main-label">
@@ -43,12 +40,10 @@
                         <div class="form-group group-password_old {if $error}has-error{elseif $isPost && $value != "" && !$error}has-success{/if}">
                             <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                             <div class="control-input">
-                                <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" value="{$value}" {if $required} aria-required="true" required{/if}{if $error} autofocus{/if}>
                                 {if $error }
                                     <span class="help-block"><i class="icon-remove"></i> {$message}</span>
                                     {assign var="error_focus" value="true"}
-                                {elseif $isPost && $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
                                 {/if}
                             </div>
                         </div><!--/.form-group-->
@@ -58,13 +53,11 @@
                         <div class="form-group group-password {if $error}has-error{elseif $isPost && $value != "" && !$error}has-success{/if}">
                             <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                             <div class="control-input">
-                                <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
                                     <span class="help-block"><i class="icon-remove"></i> {$message}</span>
                                     {assign var="error_focus" value="true"}
-                                {elseif $isPost && $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
-                            {/if}
+                                {/if}
                             </div>
                         </div><!--/.form-group-->
                         {/form_field}
@@ -76,8 +69,6 @@
                                 {if $error }
                                     <span class="help-block"><i class="icon-remove"></i> {$message}</span>
                                     {assign var="error_focus" value="true"}
-                                {elseif $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
                                 {/if}
                             </div>
                         </div><!--/.form-group-->