diff --git a/SCP/default.aspx.cs b/SCP/default.aspx.cs
index 3aa3ae2..d248a03 100644
--- a/SCP/default.aspx.cs
+++ b/SCP/default.aspx.cs
@@ -117,7 +117,11 @@ namespace SCP
                 return;
             }
             User user = DB.Users.Where(u => u.Name == p_userName).FirstOrDefault();
-            
+            if (!user.Enabled)
+            {
+                Alert.Show(GetResourceKey("用户未启用或已锁定，请联系管理员！"));
+                return;
+            }
             if (user != null)
             {
                 if (PasswordUtil.ComparePasswords(user.Password, p_password))
@@ -191,7 +195,23 @@ namespace SCP
                 }
                 else
                 {
-                    Alert.Show(GetResourceKey("用户名或密码错误！"));
+                    if (ScpCache.Config.密码验证)
+                    {
+                        var result = SCP_ASK_CONTROLLER.Update_User_ErrorCount(p_userName, Convert.ToInt32(ScpCache.Config.密码锁定次数));
+                        if (!string.IsNullOrEmpty(result.Message))
+                        {
+                            Alert.Show(result.Message);
+                        }
+                        else
+                        {
+                            Alert.Show(GetResourceKey("用户名或密码错误！"));
+                        }
+                    }
+                    else
+                    {
+                        Alert.Show(GetResourceKey("用户名或密码错误！"));
+                    }
+
                     return;
                 }
             }