diff --git a/projects/ucap-webmessenger-app/src/app/services/authentication.service.ts b/projects/ucap-webmessenger-app/src/app/services/authentication.service.ts
index f763d153..5d581e1e 100644
--- a/projects/ucap-webmessenger-app/src/app/services/authentication.service.ts
+++ b/projects/ucap-webmessenger-app/src/app/services/authentication.service.ts
@@ -62,13 +62,17 @@ export class AppAuthenticationService {
       };
     }
 
+    appUserInfo = {
+      ...appUserInfo,
+      companyGroupType: loginInfo.companyGroupType,
+      companyCode: loginInfo.companyCode,
+      loginId: loginInfo.loginId,
+      loginPw: loginInfo.loginPw
+    };
+
     if (rememberMe || autoLogin) {
       appUserInfo = {
         ...appUserInfo,
-        companyGroupType: loginInfo.companyGroupType,
-        companyCode: loginInfo.companyCode,
-        loginId: loginInfo.loginId,
-        loginPw: autoLogin ? loginInfo.loginPw : undefined,
         rememberMe,
         autoLogin
       };