diff --git a/common/database/inc/idm_common.h b/common/database/inc/idm_common.h
index 2ed7950a7febd64c346d8289ea2d1c2d82991b65..e2d23020b01b11602f90f3de917e654f7ea4d49c 100644
--- a/common/database/inc/idm_common.h
+++ b/common/database/inc/idm_common.h
@@ -25,7 +25,7 @@
 typedef struct {
     uint64_t credentialId;
     uint32_t authType;
-    uint32_t authSubType;
+    uint64_t authSubType;
     uint64_t templateId;
     uint32_t capabilityLevel;
 } CredentialInfoHal;
diff --git a/common/interface/useridm_interface.h b/common/interface/useridm_interface.h
index e73dcc06c716ddfcdd277233f25c47f203db5f38..d118f81725b171ad0fac762f0499a7847c137c1d 100644
--- a/common/interface/useridm_interface.h
+++ b/common/interface/useridm_interface.h
@@ -26,7 +26,7 @@ namespace Hal {
 typedef struct {
     uint64_t credentialId;
     uint32_t authType;
-    uint32_t authSubType;
+    uint64_t authSubType;
     uint64_t templateId;
     uint32_t capabilityLevel;
 } CredentialInfo;
diff --git a/common/user_auth/src/context_manager.c b/common/user_auth/src/context_manager.c
index 3588dbbe89d106285f502f5b50b877319032debb..7310bf4a6738402142e94b73647b57d7b987a589 100644
--- a/common/user_auth/src/context_manager.c
+++ b/common/user_auth/src/context_manager.c
@@ -66,10 +66,9 @@ UserAuthContext *GenerateContext(AuthSolutionHal params)
         LOG_ERROR("contextId is duplicate");
         return NULL;
     }
-    uint32_t authTypeATL;
-    params.authType = 1;
-    ResultCode ret = SingleAuthTrustLevel(params.userId, params.authType, &authTypeATL);
-    if (ret != RESULT_SUCCESS || authTypeATL < params.authTrustLevel) {
+    uint32_t authTypeAtl;
+    ResultCode ret = SingleAuthTrustLevel(params.userId, params.authType, &authTypeAtl);
+    if (ret != RESULT_SUCCESS || authTypeAtl < params.authTrustLevel) {
         LOG_ERROR("authTrustLevel is satisfied");
     }
 
@@ -196,6 +195,7 @@ static bool IsContextDuplicate(uint64_t contextId)
         if (context->contextId == contextId) {
             return true;
         }
+        tempNode = tempNode->next;
     }
     return false;
 }