diff --git a/src/ui/auth/ForgotPasswordScreen.js b/src/ui/auth/ForgotPasswordScreen.js
index cb379a8f..21f098f4 100644
--- a/src/ui/auth/ForgotPasswordScreen.js
+++ b/src/ui/auth/ForgotPasswordScreen.js
@@ -42,6 +42,7 @@ class ForgotPasswordScreen extends React.Component {
             </p>
             <TextInput
               ref="username"
+              autoFocus
               styles={styles.input}
               type="text"
               placeholder="Username or e-mail address"
diff --git a/src/ui/auth/ForgotUsernameScreen.js b/src/ui/auth/ForgotUsernameScreen.js
index 83586573..4b6349ec 100644
--- a/src/ui/auth/ForgotUsernameScreen.js
+++ b/src/ui/auth/ForgotUsernameScreen.js
@@ -26,6 +26,7 @@ export default class ForgotUsernameScreen extends React.Component {
             </p>
             <TextInput
               ref="username"
+              autoFocus
               styles={styles.input}
               type="text"
               placeholder="E-mail address"
diff --git a/src/ui/auth/components/LoginForm.js b/src/ui/auth/components/LoginForm.js
index dbbabd73..2df28d26 100644
--- a/src/ui/auth/components/LoginForm.js
+++ b/src/ui/auth/components/LoginForm.js
@@ -47,6 +47,7 @@ export default class LoginForm extends React.Component {
         <div style={{ width: 270 }}>
           <TextInput
             ref="username"
+            autoFocus
             styles={styles.input}
             type="text"
             placeholder="Username or e-mail address"
diff --git a/src/ui/auth/components/RegisterForm.js b/src/ui/auth/components/RegisterForm.js
index d83e6eee..8d1c451b 100644
--- a/src/ui/auth/components/RegisterForm.js
+++ b/src/ui/auth/components/RegisterForm.js
@@ -101,7 +101,7 @@ export default class RegisterForm extends React.Component {
         <div className={css(styles.fieldContainerInner)}>
           <TextInput
             ref="givenName"
-            autofocus
+            autoFocus
             styles={styles.input}
             type="text"
             placeholder="First name"
@@ -167,7 +167,7 @@ export default class RegisterForm extends React.Component {
         <div className={css(styles.fieldContainerInner)}>
           <TextInput
             ref="givenName"
-            autofocus
+            autoFocus
             styles={styles.input}
             type="text"
             placeholder="First name"
diff --git a/src/ui/components/TextInput.js b/src/ui/components/TextInput.js
index 31789965..eb94e8f1 100644
--- a/src/ui/components/TextInput.js
+++ b/src/ui/components/TextInput.js
@@ -16,7 +16,7 @@ type Props = {
   styles?: any,
   value?: ?string,
   valueTransformer?: (val: string) => string,
-  autofocus: ?boolean,
+  autoFocus?: boolean,
 };
 
 type State = {
@@ -38,20 +38,11 @@ export default class TextInput extends React.Component {
     return this.state.value.trim();
   }
 
-  componentDidMount() {
-    if (this.props.autofocus) {
-      this._input && this._input.focus();
-    }
-  }
-
   render() {
     const { styles: extraStyles, valueTransformer, ...inputProps } = this.props;
 
     return (
       <input
-        ref={view => {
-          this._input = view;
-        }}
         className={css(styles.input, extraStyles)}
         {...inputProps}
         onChange={this._onValueChange}