diff --git a/rhodecode/templates/forms/checked_password.pt b/rhodecode/templates/forms/checked_password.pt
new file mode 100644
--- /dev/null
+++ b/rhodecode/templates/forms/checked_password.pt
@@ -0,0 +1,28 @@
+<div i18n:domain="deform" tal:omit-tag=""
+      tal:define="oid oid|field.oid;
+                  name name|field.name;
+                  css_class css_class|field.widget.css_class;
+                  style style|field.widget.style">
+${field.start_mapping()}
+<div class="form-group">
+  <input type="password"
+         name="${name}"
+         value="${field.widget.redisplay and cstruct or ''}"
+         tal:attributes="class string: form-control ${css_class or ''};
+                         style style;"
+         id="${oid}"
+         i18n:attributes="placeholder"
+         placeholder="Password"/>
+</div>
+<div class="form-group">
+  <input type="password"
+         name="${name}-confirm"
+         value="${field.widget.redisplay and confirm or ''}"
+         tal:attributes="class string: form-control ${css_class or ''};
+                         style style;"
+         id="${oid}-confirm"
+         i18n:attributes="placeholder"
+         placeholder="Confirm Password"/>
+</div>
+${field.end_mapping()}
+</div>
\ No newline at end of file