diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c
index f6ed66b1b110cb8366f7de97d73d0e082c96cd7b..2189bb7f1fd6bd6c2e341e5f2c21e65f79bba568 100644
--- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c
+++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c
@@ -867,20 +867,18 @@ static int32_t RemoveAllUserCert(const struct CmContext *context, uint32_t store
     for (uint32_t i = 0; i < fileNames.size; i++) {
         certUri.data = (uint8_t *)fNames[i].data;
         certUri.size = fNames[i].size - 1;
-        ret = DeleteCertProperty((char *)certUri.data);
-        if (ret != CM_SUCCESS) {
-            CM_LOG_E("Failed delete cert: %s rdbData", (char *)certUri.data);
+        ret = CertManagerFileRemove(path, (char *)fNames[i].data);
+        if (ret != CMR_OK) {
+            CM_LOG_E("User Cert %u remove failed, ret: %d", i, ret);
             continue;
         }
         ret = CmBackupRemove(context->userId, path, &certUri);
         if (ret != CMR_OK) {
             CM_LOG_E("User Cert %u remove config and backup file failed, ret: %d", i, ret);
-            continue;
         }
-        ret = CertManagerFileRemove(path, (char *)fNames[i].data);
-        if (ret != CMR_OK) {
-            CM_LOG_E("User Cert %u remove failed, ret: %d", i, ret);
-            continue;
+        ret = DeleteCertProperty((char *)certUri.data);
+        if (ret != CM_SUCCESS) {
+            CM_LOG_E("Failed delete cert: %s rdbData", (char *)certUri.data);
         }
     }
 
diff --git a/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_sa.cpp b/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_sa.cpp
index b1f0f654ae82cc6c5eb00555a14461fe1d9353e9..f6ee7524dd1468529eec2695632ef2b57a91048e 100644
--- a/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_sa.cpp
+++ b/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_sa.cpp
@@ -43,7 +43,7 @@ const uint32_t MAX_DELAY_TIMES = 100;
 const uint32_t DELAY_INTERVAL = 200000; /* delay 200ms waiting for system event */
 
 const std::string TASK_ID = "unload";
-const uint32_t DELAY_TIME = 180000; /* delay 180000ms to unload SA */
+const uint32_t DELAY_TIME = 60000; /* delay 60000ms to unload SA */
 const std::string USER_REMOVED_EVENT = "usual.event.USER_REMOVED";
 
 constexpr int CM_IPC_THREAD_NUM = 32;