diff --git a/lib/form/templates/element-password-inline.mustache b/lib/form/templates/element-password-inline.mustache
new file mode 100644
index 00000000000..59da069256e
--- /dev/null
+++ b/lib/form/templates/element-password-inline.mustache
@@ -0,0 +1,50 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template core_form/element-password-inline
+
+    Password inline form element template.
+
+    Example context (json):
+    {
+        "element": {
+            "name": "test",
+            "id": "test0",
+            "size": null,
+            "error": null,
+            "value": "Sample text",
+            "frozen": false,
+            "iderror": "test0_error",
+            "attributes": ""
+        }
+    }
+}}
+{{< core_form/element-template-inline }}
+    {{$element}}
+        {{^element.frozen}}
+        <input type="password"
+                class="form-control {{#error}}is-invalid{{/error}}"
+                name="{{element.name}}"
+                id="{{element.id}}"
+                value="{{element.value}}"
+                size="{{element.size}}"
+                {{#error}}
+                    autofocus aria-describedby="{{element.iderror}}"
+                {{/error}} {{{element.attributes}}}>
+        {{/element.frozen}}
+    {{/element}}
+{{/ core_form/element-template-inline }}
diff --git a/lib/form/templates/element-password.mustache b/lib/form/templates/element-password.mustache
index fdd5cdb2138..d6e80f8c2ab 100644
--- a/lib/form/templates/element-password.mustache
+++ b/lib/form/templates/element-password.mustache
@@ -1,3 +1,38 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template core_form/element-password
+
+    Password form element template.
+
+    Example context (json):
+    {
+        "element": {
+            "name": "test",
+            "id": "test0",
+            "size": null,
+            "error": null,
+            "value": "Sample text",
+            "frozen": false,
+            "iderror": "test0_error",
+            "attributes": ""
+        }
+    }
+}}
 {{< core_form/element-template }}
     {{$element}}
         {{^element.frozen}}