diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index d28545508..46284867b 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -232,8 +232,8 @@ class AccountsController < ApplicationController
 
   # 用户登录
   def login
-    password = decrypt(login_params[:password]) rescue User.new.check_password?([:password].to_s)
-    #Users::LoginForm.new(login_params.merge!({password: password})).validate!
+    password = decrypt(login_params[:password]) rescue login_params[:password].to_s
+    # Users::LoginForm.new(login_params.merge!({password: password})).validate!
     @user = User.try_to_login(params[:login], password)
 
     return normal_status(-2, "错误的账号或密码") if @user.blank?
@@ -243,7 +243,7 @@ class AccountsController < ApplicationController
     login_control = LimitForbidControl::UserLogin.new(@user)
     return normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码") if login_control.forbid?
 
-    password_ok = @user.check_password?(params[:password].to_s)
+    password_ok = @user.check_password?(password.to_s)
     unless password_ok
       if login_control.remain_times-1 == 0
         normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码")