diff --git a/client/res/templates/modals/password-change-request.tpl b/client/res/templates/modals/password-change-request.tpl
index 163fe536c3..5ed7d0cd87 100644
--- a/client/res/templates/modals/password-change-request.tpl
+++ b/client/res/templates/modals/password-change-request.tpl
@@ -4,13 +4,29 @@
 <div class="cell form-group" data-name="userName">
     <label class="control-label" data-name="userName">{{translate 'Username' scope='User'}}</label>
     <div class="field" data-name="userName">
-        <input type="text" name="username" class="form-control" autocomplete="username" autocorrect="off" autocapitalize="off">
+        <input
+            type="text"
+            name="username"
+            class="form-control"
+            autocomplete="username"
+            autocorrect="off"
+            autocapitalize="off"
+            spellcheck="off"
+        >
     </div>
 </div>
 <div class="cell form-group" data-name="emailAddress">
     <label class="control-label" data-name="emailAddress">{{translate 'Email Address' scope='User'}}</label>
     <div class="field" data-name="emailAddress">
-        <input type="text" name="emailAddress" class="form-control" autocomplete="espo-change-password-emailAddress" autocorrect="off" autocapitalize="off">
+        <input
+            type="text"
+            name="emailAddress"
+            class="form-control"
+            autocomplete="espo-change-password-emailAddress"
+            autocorrect="off"
+            autocapitalize="off"
+            spellcheck="off"
+        >
     </div>
 </div>
 
diff --git a/client/src/views/modals/password-change-request.js b/client/src/views/modals/password-change-request.js
index ad3afea824..ac0f08993d 100644
--- a/client/src/views/modals/password-change-request.js
+++ b/client/src/views/modals/password-change-request.js
@@ -44,11 +44,12 @@ define('views/modals/password-change-request', 'views/modal', function (Dep) {
                 {
                     name: 'submit',
                     label: 'Submit',
-                    style: 'danger'
+                    style: 'danger',
                 },
                 {
                     name: 'cancel',
-                    label: 'Close'
+                    label: 'Close',
+                    pullLeft: true,
                 }
             ];