diff --git a/app/views/LoginView.js b/app/views/LoginView.js
index 87c9cf34f..fd3575aad 100644
--- a/app/views/LoginView.js
+++ b/app/views/LoginView.js
@@ -215,6 +215,8 @@ class LoginView extends React.Component {
 					onChangeText={value => this.setState({ user: value })}
 					onSubmitEditing={() => { this.passwordInput.focus(); }}
 					testID='login-view-email'
+					textContentType='username'
+					autoCompleteType='username'
 				/>
 				<TextInput
 					inputRef={(e) => { this.passwordInput = e; }}
@@ -226,6 +228,8 @@ class LoginView extends React.Component {
 					onChangeText={value => this.setState({ password: value })}
 					testID='login-view-password'
 					containerStyle={sharedStyles.inputLastChild}
+					textContentType='password'
+					autoCompleteType='password'
 				/>
 				<Button
 					title={I18n.t('Login')}
diff --git a/app/views/NewServerView.js b/app/views/NewServerView.js
index 1d60409d6..bee5b44a0 100644
--- a/app/views/NewServerView.js
+++ b/app/views/NewServerView.js
@@ -270,6 +270,8 @@ class NewServerView extends React.Component {
 							testID='new-server-view-input'
 							onSubmitEditing={this.submit}
 							clearButtonMode='while-editing'
+							keyboardType='url'
+							textContentType='URL'
 						/>
 						<Button
 							title={I18n.t('Connect')}