diff --git a/src/www/system_usermanager_passwordmg.php b/src/www/system_usermanager_passwordmg.php
index 2fd70fc2c34..77d08e0f4ce 100644
--- a/src/www/system_usermanager_passwordmg.php
+++ b/src/www/system_usermanager_passwordmg.php
@@ -102,6 +102,8 @@
                 $authenticator = (new OPNsense\Auth\AuthenticationFactory())->get('Local Database');
                 $input_errors = $authenticator->checkPolicy($username, $pconfig['passwordfld0'], $pconfig['passwordfld1']);
             }
+        } elseif (!empty($_SESSION['user_shouldChangePassword'])) {
+            $input_errors[] = gettext('Your password does not match the selected security policies. Please provide a new one.');
         }
 
         if (count($input_errors) == 0) {