diff --git a/src/components/root_navigator.js b/src/components/root_navigator.js
index a78f6f0a6..758f30130 100644
--- a/src/components/root_navigator.js
+++ b/src/components/root_navigator.js
@@ -120,9 +120,18 @@ export default class RootNavigator extends React.Component {
             return (
                 <SelectServerView
                     onProceed={() => {
-                        navigator.push({title: 'Sign In', signin: true});
+                        navigator.push({signin: true});
                     }}
-                />);
+                />
+            );
+        } else if (route.signin) {
+            // return (
+            //     <LoginView
+            //         onSignIn={() => {
+            //             navigator.push({title: 'Team Selection', });
+            //         }}
+            //     />
+            // );
         }
 
         return null;
diff --git a/src/components/select_server_view.js b/src/components/select_server_view.js
index 1846a9a3d..c83abd31f 100644
--- a/src/components/select_server_view.js
+++ b/src/components/select_server_view.js
@@ -68,12 +68,13 @@ class SelectServerView extends Component {
                 <TextInput
                     style={GlobalStyles.inputBox}
                     onChangeText={(serverUrl) => this.setState({serverUrl})}
+                    onSubmitEditing={this.onClick}
                     autoCapitalize='none'
                     autoCorrect={false}
                     keyboardType='url'
                     placeholder='https://mattermost.example.com'
-                    returnKeyType='done'
-                    defaultValue={this.state.serverUrl}
+                    returnKeyType='go'
+                    value={this.state.serverUrl}
                 />
                 <Button
                     text='Proceed'