diff --git a/app/actions/views/login.js b/app/actions/views/login.js
index e1c424d97..513507d64 100644
--- a/app/actions/views/login.js
+++ b/app/actions/views/login.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 import {GeneralTypes} from 'mattermost-redux/action_types';
-import {Client4} from 'mattermost-redux/client';
+import {Client, Client4} from 'mattermost-redux/client';
 
 import {ViewTypes} from 'app/constants';
 
@@ -25,14 +25,19 @@ export function handlePasswordChanged(password) {
 
 export function handleSuccessfulLogin() {
     return async (dispatch, getState) => {
+        const token = Client4.getToken();
+        const url = Client4.getUrl();
         dispatch({
             type: GeneralTypes.RECEIVED_APP_CREDENTIALS,
             data: {
-                url: Client4.getUrl(),
-                token: Client4.getToken()
+                url,
+                token
             }
         }, getState);
 
+        Client.setToken(token);
+        Client.setUrl(url);
+
         return true;
     };
 }
diff --git a/app/components/root/index.js b/app/components/root/index.js
index 8d87ac665..dc59e3f34 100644
--- a/app/components/root/index.js
+++ b/app/components/root/index.js
@@ -4,6 +4,7 @@
 import {connect} from 'react-redux';
 import DeviceInfo from 'react-native-device-info';
 
+import {Client, Client4} from 'mattermost-redux/client';
 import {getCurrentChannelId} from 'mattermost-redux/selectors/entities/channels';
 import {getCurrentUrl} from 'mattermost-redux/selectors/entities/general';
 
@@ -21,6 +22,9 @@ function mapStateToProps(state, ownProps) {
         locale = users.profiles[currentUserId].locale;
     }
 
+    Client.setLocale(locale);
+    Client4.setLocale(locale);
+
     return {
         ...ownProps,
         theme: getTheme(state),
diff --git a/app/i18n/index.js b/app/i18n/index.js
index cb1d7c5ec..fa0332523 100644
--- a/app/i18n/index.js
+++ b/app/i18n/index.js
@@ -48,20 +48,18 @@ const TRANSLATIONS = {
     'zh-TW': zhTW
 };
 
-addLocaleData([
-    deLocaleData,
-    enLocaleData,
-    esLocaleData,
-    frLocaleData,
-    jaLocaleData,
-    koLocaleData,
-    nlLocaleData,
-    plLocaleData,
-    ptLocaleData,
-    trLocaleData,
-    ruLocaleData,
-    zhLocaleData
-]);
+addLocaleData(deLocaleData);
+addLocaleData(enLocaleData);
+addLocaleData(esLocaleData);
+addLocaleData(frLocaleData);
+addLocaleData(jaLocaleData);
+addLocaleData(koLocaleData);
+addLocaleData(nlLocaleData);
+addLocaleData(plLocaleData);
+addLocaleData(ptLocaleData);
+addLocaleData(trLocaleData);
+addLocaleData(ruLocaleData);
+addLocaleData(zhLocaleData);
 
 export function getTranslations(locale) {
     return TRANSLATIONS[locale] || TRANSLATIONS[DEFAULT_LOCALE];
diff --git a/app/styles/index.js b/app/styles/index.js
index ef8a3764f..e391e5b99 100644
--- a/app/styles/index.js
+++ b/app/styles/index.js
@@ -90,7 +90,7 @@ export const GlobalStyles = StyleSheet.create({
         marginTop: 15,
         marginBottom: 15,
         fontSize: 12,
-        textAlign: 'center'
+        textAlign: 'left'
     },
 
     switchUp: {
diff --git a/yarn.lock b/yarn.lock
index 9d944ca55..3476837e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3645,7 +3645,7 @@ makeerror@1.0.x:
 
 mattermost-redux@mattermost/mattermost-redux#master:
   version "0.0.1"
-  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/b21461562fefc6abe2e31373045059652d814ad1"
+  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/caf81fd083fb4f883c787e4ca11bf17e5898e031"
   dependencies:
     deep-equal "1.0.1"
     harmony-reflect "1.5.1"