diff --git a/src/main/java/im/zhaojun/common/aop/LoginLogAspect.java b/src/main/java/im/zhaojun/common/aop/LoginLogAspect.java
index aff7858..4f6d6c7 100644
--- a/src/main/java/im/zhaojun/common/aop/LoginLogAspect.java
+++ b/src/main/java/im/zhaojun/common/aop/LoginLogAspect.java
@@ -16,7 +16,7 @@
 
 @Aspect
 @Component
-@ConditionalOnProperty(value = "log.login", havingValue = "true")
+@ConditionalOnProperty(value = "shiro-action.log.login", havingValue = "true")
 public class LoginLogAspect {
 
     @Resource
diff --git a/src/main/java/im/zhaojun/common/aop/OperationLogAspect.java b/src/main/java/im/zhaojun/common/aop/OperationLogAspect.java
index 8ee1887..1a7a1a4 100644
--- a/src/main/java/im/zhaojun/common/aop/OperationLogAspect.java
+++ b/src/main/java/im/zhaojun/common/aop/OperationLogAspect.java
@@ -24,7 +24,7 @@
  */
 @Aspect
 @Component
-@ConditionalOnProperty(value = "log.operation", havingValue = "true")
+@ConditionalOnProperty(value = "shiro-action.log.operation", havingValue = "true")
 public class OperationLogAspect {
 
     @Resource
diff --git a/src/main/java/im/zhaojun/common/shiro/credential/RetryLimitHashedCredentialsMatcher.java b/src/main/java/im/zhaojun/common/shiro/credential/RetryLimitHashedCredentialsMatcher.java
index eb7a3d3..b848374 100644
--- a/src/main/java/im/zhaojun/common/shiro/credential/RetryLimitHashedCredentialsMatcher.java
+++ b/src/main/java/im/zhaojun/common/shiro/credential/RetryLimitHashedCredentialsMatcher.java
@@ -53,7 +53,8 @@ public boolean doCredentialsMatch(AuthenticationToken token,
 				throw new ExcessiveAttemptsException();
 			}
 
-			opsForValue.set(key, retryCount, shiroActionProperties.getRetryTimeout(), TimeUnit.SECONDS);
+			Integer retryTimeout = shiroActionProperties.getRetryTimeout() == null ? 300 : shiroActionProperties.getRetryTimeout();
+			opsForValue.set(key, retryCount, retryTimeout, TimeUnit.SECONDS);
 		}
 
 		boolean matches = super.doCredentialsMatch(token, info);
diff --git a/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 9e3386e..c161594 100644
--- a/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1,13 +1,13 @@
 {
   "properties": [
     {
-      "name": "log.operation",
+      "name": "shiro-action.log.operation",
       "type": "java.lang.Boolean",
       "defaultValue": false,
       "description": "是否记录操作日志."
     },
     {
-      "name": "log.login",
+      "name": "shiro-action.log.login",
       "type": "java.lang.Boolean",
       "defaultValue": false,
       "description": "是否记录登录日志."
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 05befb5..638a465 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -32,8 +32,8 @@ spring.mvc.throw-exception-if-no-handler-found=true
 spring.resources.add-mappings=true
 spring.thymeleaf.cache=false
 
-log.operation = false
-log.login = false
+shiro-action.log.operation = false
+shiro-action.log.login = false
 
 shiro-action.super-admin-username=admin
 shiro-action.retry-count=5