diff --git a/assets/src/js/auth.js b/assets/src/js/auth.js
index eb980d49..3e3991ed 100644
--- a/assets/src/js/auth.js
+++ b/assets/src/js/auth.js
@@ -2,7 +2,7 @@
  * @Author: printempw
  * @Date:   2016-07-17 10:54:22
  * @Last Modified by:   printempw
- * @Last Modified time: 2016-07-28 15:44:31
+ * @Last Modified time: 2016-07-29 11:10:21
  */
 
 'use strict';
@@ -42,6 +42,7 @@ $('#login-button').click(function() {
             if (data.captcha == "") {
                 showMsg('你还没有填写验证码哦');
                 $('#captcha').focus();
+                return false;
             }
         }
 
@@ -71,6 +72,10 @@ $('#login-button').click(function() {
                         freshCaptcha();
                     }
 
+                    if ($('#captcha-form').css('display') == "block") {
+                        freshCaptcha();
+                    }
+
                     showMsg(json.msg, 'warning');
                     $('#login-button').html('登录').prop('disabled', '');
                 }