diff --git a/theme/noname/templates/core_form/element-passwordunmask.mustache b/theme/noname/templates/core_form/element-passwordunmask.mustache
index 8d6d191ef56..66eb5c737c8 100644
--- a/theme/noname/templates/core_form/element-passwordunmask.mustache
+++ b/theme/noname/templates/core_form/element-passwordunmask.mustache
@@ -1,17 +1,4 @@
-{{< core_form/element-template }}
-    {{$element}}
-        <input type="password"
-                {{#element.frozen}}readonly{{/element.frozen}}
-                class="form-control {{#error}}form-control-danger{{/error}}"
-                name="{{element.name}}"
-                id="{{element.id}}"
-                value="{{element.value}}"
-                size="{{element.size}}"
-                {{#error}}
-                    autofocus aria-describedby="id_error_{{element.name}}"
-                {{/error}} {{{attributes}}}>
-    {{/element}}
-{{/ core_form/element-template }}
+{{> core_form/element-password }}
 {{#js}}
 require(['core/yui'], function(Y) {
     Y.use('moodle-form-passwordunmask', function() {