diff --git a/view/theme/frio/templates/field_openid.tpl b/view/theme/frio/templates/field_openid.tpl
index 00520b06a..8081f9cf1 100644
--- a/view/theme/frio/templates/field_openid.tpl
+++ b/view/theme/frio/templates/field_openid.tpl
@@ -4,4 +4,4 @@
 	<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2|escape:'html'}}" aria-describedby="{{$field.0}}_tip">
 	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
 	<div class="clear"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/theme/frio/templates/field_password.tpl b/view/theme/frio/templates/field_password.tpl
index 87b689bd5..31defaf33 100644
--- a/view/theme/frio/templates/field_password.tpl
+++ b/view/theme/frio/templates/field_password.tpl
@@ -1,6 +1,7 @@
 
-<div id="wrapper_{{$field.0}}" class="form-group field password">
-	<label for="id_{{$field.0}}">{{$field.1}}</label>
-	<input class="form-control" type="password" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2|escape:'html'}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
+<div id="id_{{$field.0}}_wrapper" class="form-group field input password">
+	<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
+	<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="password" value="{{$field.2|escape:'html'}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
 	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+	<div class="clear"></div>
 </div>
diff --git a/view/theme/frio/templates/field_password_1.tpl b/view/theme/frio/templates/field_password_1.tpl
deleted file mode 100644
index 6bf16dacd..000000000
--- a/view/theme/frio/templates/field_password_1.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<div id="id_{{$field.0}}_wrapper" class="form-group field input password">
-	<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
-	<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2|escape:'html'}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
-	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
-	<div class="clear"></div>
-</div>
\ No newline at end of file