diff --git a/Changes.md b/Changes.md
index f217f92..ea85289 100644
--- a/Changes.md
+++ b/Changes.md
@@ -4,6 +4,8 @@ Version Information
 Version 402.1.3 - TBR
 --------------------------
 1. Update theme version of Font Awesome 6 to 6.4.2 from 6.4.0.
+2. Fix 'username unicode characters on login page'.  Really strange this one as caused by 'json_encode' in 'quote' method
+   of 'mustache_quote_helper' being called when '!}}' and '{{' not used to make the 'input' tag on one line in the output.
 
 Version 402.1.2 - 08/09/23
 --------------------------
diff --git a/templates/core/loginform.mustache b/templates/core/loginform.mustache
index f623cd2..87bfd48 100644
--- a/templates/core/loginform.mustache
+++ b/templates/core/loginform.mustache
@@ -133,18 +133,19 @@
                                     {{#str}} usernameemail {{/str}}
                                 {{/canloginbyemail}}
                             </label>
-                            <input type="text" name="username" id="username"
-                                class="form-control"
-                                value="{{username}}"
-                                placeholder={{#quote}}{{^canloginbyemail}}{{#str}}username{{/str}}{{/canloginbyemail}}{{#canloginbyemail}}{{#str}}usernameemail{{/str}}{{/canloginbyemail}}{{/quote}}
-                                autocomplete="username">
+                            <input type="text" name="username" id="username" {{!
+                                !}}class="form-control" {{!
+                                !}}value="{{username}}" {{!
+                                !}}placeholder="{{^canloginbyemail}}{{#cleanstr}}username{{/cleanstr}}{{/canloginbyemail}}{{!
+                                !}}{{#canloginbyemail}}{{#cleanstr}}usernameemail{{/cleanstr}}{{/canloginbyemail}}" {{!
+                                !}}autocomplete="username">
                         </div>
                         <div class="form-group">
                             <label for="password" class="sr-only">{{#str}} password {{/str}}</label>
-                            <input type="password" name="password" id="password" value=""
-                                class="form-control"
-                                placeholder={{#quote}}{{#str}}password{{/str}}{{/quote}}
-                                autocomplete="current-password">
+                            <input type="password" name="password" id="password" value="" {{!
+                                !}}class="form-control" {{!
+                                !}}placeholder="{{#cleanstr}}password{{/cleanstr}}" {{!
+                                !}}autocomplete="current-password">
                         </div>
                         {{#rememberusername}}
                             <div class="rememberpass mt-3">