From ef4bc3b1e2a4e17c401b09c97c159620cc8b4ad8 Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Thu, 2 Jul 2020 21:03:31 +0200
Subject: [PATCH] MM-26667 Set EMM username as the initial loginId (#4524)

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
---
 app/screens/login/login.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/screens/login/login.js b/app/screens/login/login.js
index 5b2f05b09..9c6085857 100644
--- a/app/screens/login/login.js
+++ b/app/screens/login/login.js
@@ -297,7 +297,8 @@ export default class Login extends PureComponent {
     setEmmUsernameIfAvailable = async () => {
         const managedConfig = await mattermostManaged.getConfig();
         if (managedConfig?.username && this.loginRef.current) {
-            this.loginRef.current.setNativeProps({text: managedConfig?.username});
+            this.loginRef.current.setNativeProps({text: managedConfig.username});
+            this.loginId = managedConfig.username;
         }
     }