diff --git a/CHANGELOG.md b/CHANGELOG.md
index 545a9f5b51..88f99de60b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Draft
+- Fixed password complexity error not displaying the complexity rules set in the store settings [#2117](https://github.com/bigcommerce/cornerstone/pull/2117)
 
 ## 6.1.0 (09-03-2021)
 - Fixed images placeholder on hero carousel shifted on mobile when slide has content. [#2112](https://github.com/bigcommerce/cornerstone/pull/2112)
diff --git a/assets/js/theme/account.js b/assets/js/theme/account.js
index 6e2c7d2650..aac824037e 100644
--- a/assets/js/theme/account.js
+++ b/assets/js/theme/account.js
@@ -347,7 +347,7 @@ export default class Account extends PageManager {
         }
 
         if ($passwordElement && $password2Element) {
-            const { password: enterPassword, password_match: matchPassword, invalid_password: invalidPassword } = this.validationDictionary;
+            const { password: enterPassword, password_match: matchPassword } = this.validationDictionary;
             editValidator.remove(passwordSelector);
             editValidator.remove(password2Selector);
             Validators.setPasswordValidation(
@@ -355,7 +355,7 @@ export default class Account extends PageManager {
                 passwordSelector,
                 password2Selector,
                 this.passwordRequirements,
-                createPasswordValidationErrorTextObject(enterPassword, enterPassword, matchPassword, invalidPassword),
+                createPasswordValidationErrorTextObject(enterPassword, enterPassword, matchPassword, this.passwordRequirements.error),
                 true,
             );
         }
diff --git a/assets/js/theme/auth.js b/assets/js/theme/auth.js
index 6c52255e43..dba4e76729 100644
--- a/assets/js/theme/auth.js
+++ b/assets/js/theme/auth.js
@@ -89,7 +89,7 @@ export default class Auth extends PageManager {
     }
 
     registerNewPasswordValidation() {
-        const { password: enterPassword, password_match: matchPassword, invalid_password: invalidPassword } = this.validationDictionary;
+        const { password: enterPassword, password_match: matchPassword } = this.validationDictionary;
         const newPasswordForm = '.new-password-form';
         const newPasswordValidator = nod({
             submit: $(`${newPasswordForm} input[type="submit"]`),
@@ -97,7 +97,7 @@ export default class Auth extends PageManager {
         });
         const passwordSelector = $(`${newPasswordForm} input[name="password"]`);
         const password2Selector = $(`${newPasswordForm} input[name="password_confirm"]`);
-        const errorTextMessages = createPasswordValidationErrorTextObject(enterPassword, enterPassword, matchPassword, invalidPassword);
+        const errorTextMessages = createPasswordValidationErrorTextObject(enterPassword, enterPassword, matchPassword, this.passwordRequirements.error);
         Validators.setPasswordValidation(
             newPasswordValidator,
             passwordSelector,
@@ -157,7 +157,7 @@ export default class Auth extends PageManager {
         }
 
         if ($passwordElement && $password2Element) {
-            const { password: enterPassword, password_match: matchPassword, invalid_password: invalidPassword } = this.validationDictionary;
+            const { password: enterPassword, password_match: matchPassword } = this.validationDictionary;
 
             createAccountValidator.remove(passwordSelector);
             createAccountValidator.remove(password2Selector);
@@ -166,7 +166,7 @@ export default class Auth extends PageManager {
                 passwordSelector,
                 password2Selector,
                 this.passwordRequirements,
-                createPasswordValidationErrorTextObject(enterPassword, enterPassword, matchPassword, invalidPassword),
+                createPasswordValidationErrorTextObject(enterPassword, enterPassword, matchPassword, this.passwordRequirements.error),
             );
         }