diff --git a/admin/views/users/user/user.html b/admin/views/users/user/user.html
index c0be0eaa..cdafbd34 100644
--- a/admin/views/users/user/user.html
+++ b/admin/views/users/user/user.html
@@ -36,7 +36,7 @@
 												<a class="btn btn-primary btn-rounded btn-xs" ng-click="editUser(user)" >{{'SETTING.EDIT' | translate}}</a>
 												<a ng-hide="user.name=='administrator'" class="btn btn-info btn-rounded btn-xs" ng-click="resetPassword(user)" >{{'USER.RESET_PASSWORD' | translate}}</a>
 												<a ng-hide="user.name=='administrator'" ng-click="deleteUser(user)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>
-												<a ng-hide="user.is_locked" ng-click="unlockUser(user)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.UNLOCK' | translate}}</a>
+												<a ng-hide="!user.is_locked" ng-click="unlockUser(user)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.UNLOCK' | translate}}</a>
 											</td>
 										</tr>
 									</tbody>
diff --git a/myems-api/core/user.py b/myems-api/core/user.py
index 9f2f1c0b..f9ac0a9e 100644
--- a/myems-api/core/user.py
+++ b/myems-api/core/user.py
@@ -60,7 +60,7 @@ class UserCollection:
                                    account_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'),
                                "password_expiration_datetime":
                                    password_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'),
-                               "is_locked": True if row[10] < 3 else False}
+                               "is_locked": True if row[10] >= config.maximum_failed_login_count else False}
                 result.append(meta_result)
 
         resp.text = json.dumps(result)