diff --git a/module/company/config/table.php b/module/company/config/table.php
index 289ab61b26..9bb0101890 100644
--- a/module/company/config/table.php
+++ b/module/company/config/table.php
@@ -15,7 +15,7 @@ if(!empty($config->sso->turnon))
 $config->company->user->actionList['unlock']['icon']         = 'unlock';
 $config->company->user->actionList['unlock']['text']         = $lang->user->unlock;
 $config->company->user->actionList['unlock']['hint']         = $lang->user->unlock;
-$config->company->user->actionList['unlock']['url']          = array('module' => 'user', 'method' => 'unlock', 'params' => 'account={account}');
+$config->company->user->actionList['unlock']['url']          = array('module' => 'user', 'method' => 'unlock', 'params' => 'userID={id}');
 $config->company->user->actionList['unlock']['className']    = 'ajax-submit';
 $config->company->user->actionList['unlock']['data-confirm'] = $lang->user->confirmUnlock;
 
diff --git a/module/user/model.php b/module/user/model.php
index 1bef93d05f..4a2621392b 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1385,10 +1385,10 @@ class userModel extends model
      */
     public function checkLocked(string $account): bool
     {
-        if($this->session->{"{$account}.loginLocked"} && (time() - strtotime($this->session->{"{$account}.loginLocked"})) <= $this->config->user->lockMinutes * 60) return true;
-
         $user = $this->dao->select('locked')->from(TABLE_USER)->where('account')->eq($account)->fetch();
-        if(empty($user) || is_null($user->locked)) return false;
+        if(empty($user) || empty($user->locked)) return false;
+
+        if($this->session->{"{$account}.loginLocked"} && (time() - strtotime($this->session->{"{$account}.loginLocked"})) <= $this->config->user->lockMinutes * 60) return true;
 
         if((time() - strtotime($user->locked)) > $this->config->user->lockMinutes * 60) return false;