diff --git a/templates/field_input.tpl b/templates/field_input.tpl
new file mode 100644
index 0000000000..1813602713
--- /dev/null
+++ b/templates/field_input.tpl
@@ -0,0 +1,7 @@
+
+<div id="id_{{$field.0}}_wrapper" class="form-group field input">
+	<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}}" {{if $field.6 eq "email"}} type="email"{{elseif $field.6 eq "url"}} type="url"{{else}}type="text"{{/if}} value="{{$field.2|escape:'html'}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{/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/templates/field_password.tpl b/templates/field_password.tpl
new file mode 100644
index 0000000000..87b689bd53
--- /dev/null
+++ b/templates/field_password.tpl
@@ -0,0 +1,6 @@
+
+<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}}
+	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+</div>