diff --git a/app/components/Login/LocalLogin.js b/app/components/Login/LocalLogin.js
index 0f0d621..55f094d 100644
--- a/app/components/Login/LocalLogin.js
+++ b/app/components/Login/LocalLogin.js
@@ -30,15 +30,18 @@ export default function LocalLogin({ doLoginAction }) {
   return (
     <View style={styles.loginWrap}>
       <TextInput
-        style={{height: 40}}
-        placeholder="email"
+        keyboardType="email-address"
         onChangeText={(text) => _updateState('username', text)}
+        placeholder="email"
+        style={{height: 40}}
         value={username}
       />
       <TextInput
-        style={{height: 40}}
-        placeholder="password"
+        enablesReturnKeyAutomatically
         onChangeText={(text) => _updateState('password', text)}
+        placeholder="password"
+        secureTextEntry
+        style={{height: 40}}
         value={password}
       />
       <Button
diff --git a/app/screens/Register.js b/app/screens/Register.js
index d5cb63a..fdae542 100644
--- a/app/screens/Register.js
+++ b/app/screens/Register.js
@@ -3,6 +3,11 @@ import { Text, View } from 'react-native';
 
 import styles from './Register.styles.js';
 
+const STRINGS = {
+  NOM_EXPLANATION: 'Selecting a nom de bid allows you to bid anonymously - or not. By default, we\'ll use your first initial and last name.',
+  SUBMIT_REGISTRATION: 'Register',
+};
+
 export default class Register extends Component {
 
   static get propTypes() {
@@ -74,15 +79,44 @@ export default class Register extends Component {
   render() {
     return (
       <View style={styles.container}>
-        <Text style={styles.title}>Sign In or Register</Text>
-        <View style={styles.localLogin}>
-          <LocalLogin />
+        <Text style={styles.title}>Register</Text>
+        <View style={styles.nameWrap}>
+          <TextInput
+            onChange={(text) => this.setState({ firstName: text })}
+            placeholder="first name"
+            style={styles.textInput}
+            value={this.state.firstName}
+          />
+          <TextInput
+            onChange={(text) => this.setState({ lastName: text })}
+            placeholder="last name"
+            style={styles.textInput}
+            value={this.state.lastName}
+          />
         </View>
-        <View style={styles.services}>
-          <FacebookLogin />
+        <View style={styles.emailWrap}>
+          <TextInput
+            keyboardType="email-address"
+            onChangeText={(text) => _updateState('username', text)}
+            onEndEditing={(text) => this._validateEmail(text)}
+            placeholder="email address"
+            style={styles.textInput}
+            value={this.state.email}
+          />
+        </View>
+        <View style={styles.nomWrap}>
+          <Text style={styles.hintText}>{STRINGS.NOM_EXPLANATION}</Text>
+          <TextInput
+            keyboardType="email-address"
+            onChangeText={(text) => _updateState('username', text)}
+            onEndEditing={(text) => this._validateEmail(text)}
+            placeholder="email address"
+            style={styles.textInput}
+            value={this.state.email}
+          />
         </View>
         <View style={styles.register}>
-          <Button onPress={this._doRegistration} />
+          <Button title={STRINGS.SUBMIT_REGISTRATION} onPress={this._doRegistration} />
         </View>
       </View>
     );