1 files changed, 3 insertions, 2 deletions

diff --git a/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/LoginExternalAuthServiceImpl.java b/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/LoginExternalAuthServiceImpl.java
index a0eee23d..d2ccfc2e 100644
--- a/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/LoginExternalAuthServiceImpl.java
+++ b/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/LoginExternalAuthServiceImpl.java
@@ -48,6 +48,8 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 
 import org.onap.portalsdk.core.command.LoginBean;
+import org.onap.portalsdk.core.domain.Role;
+import org.onap.portalsdk.core.domain.User;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.menu.MenuBuilder;
 import org.onap.portalsdk.core.service.DataAccessService;
@@ -55,8 +57,6 @@ import org.onap.portalsdk.core.service.LoginServiceCentralizedImpl;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.onap.portalsdk.core.web.support.AppUtils;
 import org.onap.portalsdk.core.web.support.UserUtils;
-import org.onap.portalsdk.core.domain.Role;
-import org.onap.portalsdk.core.domain.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -211,6 +211,7 @@ public class LoginExternalAuthServiceImpl implements LoginExternalAuthService {
 	private User findUser(LoginBean bean, HttpServletRequest request) throws Exception {
 		User user =  userApiService.getUser(bean.getUserid(), request);
 		user.setId(getUserIdByOrgUserId(user.getOrgUserId()));
+		user.setLoginId(bean.getUserid());
 		logger.debug(EELFLoggerDelegate.debugLogger, "findUser: Returning final user roles and permissions", user.toString());
 		return user;
 	}