diff --git a/user_mgr.cpp b/user_mgr.cpp
index edb25f3..6d58fa8 100644
--- a/user_mgr.cpp
+++ b/user_mgr.cpp
@@ -396,6 +396,9 @@
     try
     {
         executeUserDelete(userName.c_str());
+
+        // Clear user fail records
+        executeUserClearFailRecords(userName.c_str());
     }
     catch (const InternalFailure& e)
     {
@@ -968,7 +971,8 @@
 
     try
     {
-        executeCmd("/usr/sbin/faillock", "--user", userName.c_str(), "--reset");
+        // Clear user fail records
+        executeUserClearFailRecords(userName.c_str());
     }
     catch (const InternalFailure& e)
     {
@@ -1607,6 +1611,11 @@
     executeCmd("/usr/sbin/userdel", userName, "-r");
 }
 
+void UserMgr::executeUserClearFailRecords(const char* userName)
+{
+    executeCmd("/usr/sbin/faillock", "--user", userName, "--reset");
+}
+
 void UserMgr::executeUserRename(const char* userName, const char* newUserName)
 {
     std::string newHomeDir = "/home/";