diff --git a/xxl-job-admin/src/main/resources/static/js/login.1.js b/xxl-job-admin/src/main/resources/static/js/login.1.js
index a4203781f..ef4096157 100644
--- a/xxl-job-admin/src/main/resources/static/js/login.1.js
+++ b/xxl-job-admin/src/main/resources/static/js/login.1.js
@@ -16,12 +16,12 @@ $(function(){
         	userName : {  
         		required : true ,
                 minlength: 4,
-                maxlength: 18
+                maxlength: 20
             },  
             password : {  
             	required : true ,
                 minlength: 4,
-                maxlength: 18
+                maxlength: 20
             } 
         }, 
         messages : {  
@@ -32,7 +32,7 @@ $(function(){
             password : {
             	required  : I18n.login_password_empty  ,
                 minlength : I18n.login_password_lt_4
-                /*,maxlength:"登录密码不应超过18位"*/
+                /*,maxlength:"登录密码不应超过20位"*/
             }
         }, 
 		highlight : function(element) {  
diff --git a/xxl-job-admin/src/main/resources/templates/login.ftl b/xxl-job-admin/src/main/resources/templates/login.ftl
index c3f696385..e6a29e01b 100644
--- a/xxl-job-admin/src/main/resources/templates/login.ftl
+++ b/xxl-job-admin/src/main/resources/templates/login.ftl
@@ -15,11 +15,11 @@
 			<div class="login-box-body">
 				<p class="login-box-msg">${I18n.admin_name}</p>
 				<div class="form-group has-feedback">
-	            	<input type="text" name="userName" class="form-control" placeholder="${I18n.login_username_placeholder}"  maxlength="18" >
+	            	<input type="text" name="userName" class="form-control" placeholder="${I18n.login_username_placeholder}"  maxlength="20" >
 	            	<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
 				</div>
 	          	<div class="form-group has-feedback">
-	            	<input type="password" name="password" class="form-control" placeholder="${I18n.login_password_placeholder}"  maxlength="18" >
+	            	<input type="password" name="password" class="form-control" placeholder="${I18n.login_password_placeholder}"  maxlength="20" >
 	            	<span class="glyphicon glyphicon-lock form-control-feedback"></span>
 	          	</div>
 				<div class="row">