diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java b/maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java
index a8b089a0..4e97e117 100644
--- a/maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java
+++ b/maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java
@@ -253,8 +253,8 @@ public class PasswordPolicyValidator {
                           passwordPolicy.getDuration(), 
                           (intDuration > passwordPolicy.getDuration())
                     );
-            //auto unlock attempts when intDuration > set Duration
-            if(intDuration > passwordPolicy.getDuration()) {
+            //auto unlock attempts when intDuration >= set Duration
+            if(intDuration >= passwordPolicy.getDuration()) {
                 _logger.debug("resetAttempts ...");
                 resetAttempts(userInfo);
             }else {
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/cas_sso_submint.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/cas_sso_submint.ftl
index b6b1b246..efab39ee 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/cas_sso_submint.ftl
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/cas_sso_submint.ftl
@@ -9,7 +9,7 @@
             srcUrl = srcUrl.substring(srcUrl.indexOf("#"));
             var callbackUrl = "${callbackUrl}";
             if(srcUrl.indexOf("#") >-1 ){
-                callbackUrl =callbackUrl.replace("?",srcUrl + "&");
+                callbackUrl =callbackUrl + srcUrl;
             }
             window.top.location.href = callbackUrl;
        }