diff --git a/package.json b/package.json
index 875382d..eac61ff 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "release-android": "cd android && fastlane beta"
   },
   "dependencies": {
+    "email-validator": "^1.1.1",
     "moment": "^2.19.1",
     "native-base": "^2.3.2",
     "prop-types": "^15.5.10",
diff --git a/src/api.js b/src/api.js
index 133c5ca..2c3644a 100644
--- a/src/api.js
+++ b/src/api.js
@@ -11,6 +11,7 @@ export function requestLogin(username, password) {
     return (dispatch) => {
         // We are now logging in
         dispatch(loginRequest());
+
         return fetch(`${Config.DUSKEN_API_URL}/auth/obtain-token/`, {
             method: 'POST',
             headers: {
diff --git a/src/modules/membership/MembershipContainer.js b/src/modules/membership/MembershipContainer.js
index 9017461..8a4b2ff 100644
--- a/src/modules/membership/MembershipContainer.js
+++ b/src/modules/membership/MembershipContainer.js
@@ -2,16 +2,15 @@ import React, {Component} from 'react';
 import {connect} from "react-redux";
 
 import Membership from "./Membership";
+import ProofContainer from "./ProofContainer";
 import { logout } from "../../actions";
 import {requestUserData} from "../../api";
-import ProofContainer from "./ProofContainer";
 
 class MembershipContainer extends Component {
     constructor(props) {
         super(props);
 
         this.state = {
-            isAuthenticated: props.isAuthenticated,
             isFetchingUserData: props.isFetchingUserData,
             userToken: props.userToken,
             lastOrder: props.lastOrder,
@@ -19,9 +18,6 @@ class MembershipContainer extends Component {
     }
 
     componentWillReceiveProps(nextProps) {
-        if(this.state.isAuthenticated !== nextProps.isAuthenticated) {
-            this.setState({isAuthenticated: nextProps.isAuthenticated})
-        }
         if(this.state.userToken !== nextProps.userToken) {
             this.setState({userToken: nextProps.userToken}, () => {
                 if(nextProps.userToken) {
@@ -60,6 +56,7 @@ class MembershipContainer extends Component {
         if (this.props.user) {
             return <ProofContainer
                 user={this.props.user}
+                isAuthenticated={this.props.isAuthenticated}
                 userToken={this.state.userToken}
                 fetchUser={this.fetchUser}
                 onLogoutPress={this.onLogoutPress}
@@ -69,17 +66,17 @@ class MembershipContainer extends Component {
     }
 }
 
-function stateToProps(state) {
+function storeToProps(store) {
     return {
-        isAuthenticated: state.isAuthenticated,
-        isFetchingUserData: state.isFetchingUserData,
-        userToken: state.userToken,
-        user: state.user,
-        lastOrder: state.lastOrder
+        isAuthenticated: store.isAuthenticated,
+        isFetchingUserData: store.isFetchingUserData,
+        userToken: store.userToken,
+        user: store.user,
+        lastOrder: store.lastOrder
     };
 }
 
 export default connect(
-    stateToProps,
+    storeToProps,
     { requestUserData, logout }
 )(MembershipContainer);
diff --git a/src/modules/register/UserRegister.js b/src/modules/register/UserRegister.js
index f73c8a9..c7a8e3e 100644
--- a/src/modules/register/UserRegister.js
+++ b/src/modules/register/UserRegister.js
@@ -1,6 +1,8 @@
 import React, {Component} from 'react';
 import {Container, Header, Content, Form, Item, Input, Label, Spinner, Button, Text, Icon, Toast} from 'native-base';
 import {Platform, StyleSheet, View} from "react-native";
+import EmailValidator from 'email-validator';
+import platform from "native-base/src/theme/variables/platform";
 
 export default class UserRegister extends Component {
     constructor(props) {
@@ -27,7 +29,9 @@ export default class UserRegister extends Component {
         for(let key of fieldNames) {
             const value = this.state[key];
             if(value === '') {
-                errors[key] = 'Feltet kan ikke være tomt';
+                errors[key] = 'kan ikke være tomt';
+            } else if(key === 'email' && !EmailValidator.validate(value)) {
+                errors[key] = 'er ikke en gyldig e-post';
             } else {
                 delete errors[key];
             }
@@ -50,12 +54,13 @@ export default class UserRegister extends Component {
             <Input
                 autoFocus={true}
                 returnKeyType="next"
-                onChangeText={(text) => {
-                    this.setState({firstName: text}, () => { this.validateForm('firstName'); });
+                onChangeText={(firstName) => {
+                    this.setState({firstName}, () => { this.validateForm('firstName'); });
                 }}
                 onSubmitEditing={() => {
                     this.refs.lastNameInput._root.focus()
                 }}
+                value={this.state.firstName}
             />
             {this.fieldHasError('firstName') && <Icon name='close-circle' />}
         </Item>;
@@ -67,12 +72,13 @@ export default class UserRegister extends Component {
             <Input
                 ref="lastNameInput"
                 returnKeyType="next"
-                onChangeText={(text) => {
-                    this.setState({lastName: text}, () => { this.validateForm('lastName'); });
+                onChangeText={(lastName) => {
+                    this.setState({lastName}, () => { this.validateForm('lastName'); });
                 }}
                 onSubmitEditing={() => {
                     this.refs.emailInput._root.focus()
                 }}
+                value={this.state.lastName}
             />
             {this.fieldHasError('lastName') && <Icon name='close-circle' />}
         </Item>;
@@ -87,12 +93,13 @@ export default class UserRegister extends Component {
                 autoCapitalize="none"
                 autoCorrect={false}
                 returnKeyType="next"
-                onChangeText={(text) => {
-                    this.setState({email: text}, () => { this.validateForm('email'); });
+                onChangeText={(email) => {
+                    this.setState({email}, () => { this.validateForm('email'); });
                 }}
                 onSubmitEditing={() => {
                     this.refs.phoneInput._root.focus()
                 }}
+                value={this.state.email}
             />
             {this.fieldHasError('email') && <Icon name='close-circle' />}
         </Item>;
@@ -105,12 +112,13 @@ export default class UserRegister extends Component {
                 ref="phoneInput"
                 returnKeyType="next"
                 keyboardType="phone-pad"
-                onChangeText={(text) => {
-                    this.setState({phoneNumber: text}, () => { this.validateForm('phoneNumber'); });
+                onChangeText={(phoneNumber) => {
+                    this.setState({phoneNumber}, () => { this.validateForm('phoneNumber'); });
                 }}
                 onSubmitEditing={() => {
                     this.refs.passwordInput._root.focus()
                 }}
+                value={this.state.phoneNumber}
             />
             {this.fieldHasError('phoneNumber') && <Icon name='close-circle' />}
         </Item>;
@@ -124,26 +132,38 @@ export default class UserRegister extends Component {
                 secureTextEntry={true}
                 autoCapitalize="none"
                 autoCorrect={false}
-                onChangeText={(text) => {
-                    this.setState({password: text}, () => { this.validateForm('password'); });
+                onChangeText={(password) => {
+                    this.setState({password}, () => { this.validateForm('password'); });
                 }}
                 onSubmitEditing={this.onRegisterPress}
+                value={this.state.password}
             />
             {this.fieldHasError('password') && <Icon name='close-circle' />}
         </Item>
     }
 
-    showError = () => {
-        // TODO: Move these from prop to state in componentWillRecieveProps
-        // TODO: Format these and highlight error fields
-        if (this.props.registerError && Object.keys(this.props.registerError).length !== 0) {
-            const err = this.props.registerError.non_field_errors;
+    componentWillReceiveProps(nextProps) {
+        if(this.props.registerError !== nextProps.registerError) {
+            this.setState({'errors': nextProps.registerError})
+        }
+    }
+
+    showNonFieldError = () => {
+        const errors = this.props.registerError;
+        if (Object.keys(errors).length !== 0 && 'non_field_errors' in errors) {
+            const err = errors.non_field_errors;
             let errorFormatted = err ? err[0] : 'Kunne ikke registrere bruker, prøv igjen...';
             return <View style={styles.errorBox}><Text style={styles.errorMessage}>{errorFormatted}</Text></View>
         }
-        else {
-            return <View style={styles.errorBox}/>
+
+        return <View style={styles.errorBox}/>
+    };
+
+    showFieldError = (field) => {
+        if(!this.fieldHasError(field) ) {
+            return;
         }
+        return <Item style={styles.errorText}><Text style={styles.errorMessage}>{this.state.errors[field]}</Text></Item>;
     };
 
     showSpinner = () => {
@@ -158,11 +178,16 @@ export default class UserRegister extends Component {
                 <Content keyboardShouldPersistTaps='always'>
                     <Form style={styles.card}>
                         {this.firstNameInput()}
+                        {this.showFieldError('firstName')}
                         {this.lastNameInput()}
+                        {this.showFieldError('lastName')}
                         {this.emailInput()}
+                        {this.showFieldError('email')}
                         {this.phoneNumberInput()}
+                        {this.showFieldError('phoneNumber')}
                         {this.passwordInput()}
-                        {this.showError()}
+                        {this.showFieldError('password')}
+                        {this.showNonFieldError()}
                         {this.registerbutton()}
                         {this.showSpinner()}
                     </Form>
@@ -172,7 +197,7 @@ export default class UserRegister extends Component {
     }
 
     onRegisterPress = () => {
-        if( !this.validateForm() ) {
+        if( !this.canSubmitForm() ) {
             Toast.show({
                 text: 'Noen av feltene er ikke fylt ut riktig',
                 position: 'bottom',
@@ -192,7 +217,7 @@ export default class UserRegister extends Component {
     };
 
     registerbutton() {
-        const isDisabled = this.props.isRegisteringUser || !this.canSubmitForm();
+        const isDisabled = this.state.touched.size === 0 || this.props.isRegisteringUser || !this.canSubmitForm();
 
         return (<Button
             full
@@ -222,7 +247,8 @@ const styles = StyleSheet.create({
     },
     errorMessage: {
         textAlign: 'center',
-        color: 'red',
+        color: platform.btnDangerBg,
+        fontSize: 14,
     },
     card: {
         borderColor: '#e1e8ee',
@@ -242,4 +268,8 @@ const styles = StyleSheet.create({
         margin: 8,
         backgroundColor: '#fff',
     },
+    errorText: {
+        paddingTop: 2,
+        paddingBottom: 12,
+    }
 });
\ No newline at end of file
diff --git a/src/modules/register/UserRegisterContainer.js b/src/modules/register/UserRegisterContainer.js
index aa6c47a..4aed661 100644
--- a/src/modules/register/UserRegisterContainer.js
+++ b/src/modules/register/UserRegisterContainer.js
@@ -9,8 +9,6 @@ class UserRegisterContainer extends Component {
         super(state);
         this.state = {
             isAuthenticated: false,
-            isRegisteringUser: false,
-            registerError: null
         }
     }
 
@@ -20,12 +18,6 @@ class UserRegisterContainer extends Component {
                 this.props.onRegister();
             }
         }
-        if (this.state.isRegisteringUser !== nextProps.isRegisteringUser) {
-            this.setState({isRegisteringUser: nextProps.isRegisteringUser});
-        }
-        if (this.state.registerError !== nextProps.registerError) {
-            this.setState({registerError: nextProps.registerError});
-        }
     }
 
     onRegisterPress = (firstName, lastName, email, phoneNumber, password) => {
@@ -33,18 +25,24 @@ class UserRegisterContainer extends Component {
     };
 
     render() {
-        return <UserRegister {...this.state} onRegisterPress={this.onRegisterPress} />;
+        return <UserRegister
+            {...this.state}
+            onRegisterPress={this.onRegisterPress}
+            registerError={this.props.registerError}
+            isRegisteringUser={this.props.isRegisteringUser}
+        />;
     }
 }
 
-function stateToProps(state) {
+function storeToProps(store) {
+    const errors = store.registerError === null ? {} : store.registerError;
     return {
-        isAuthenticated: state.isAuthenticated,
-        isRegisteringUser: state.isRegisteringUser,
-        registerError: state.registerError
+        isAuthenticated: store.isAuthenticated,
+        isRegisteringUser: store.isRegisteringUser,
+        registerError: errors
     };
 }
 export default connect(
-    stateToProps,
+    storeToProps,
     {requestRegisterUser}
 )(UserRegisterContainer);
\ No newline at end of file
diff --git a/src/reducers.js b/src/reducers.js
index abf1dac..7ec1111 100644
--- a/src/reducers.js
+++ b/src/reducers.js
@@ -11,6 +11,8 @@ import {
     REGISTER_USER_SUCCESS, MEMBERSHIP_CHARGE_REQUEST, MEMBERSHIP_CHARGE_FAILURE, MEMBERSHIP_CHARGE_SUCCESS,
 } from './actions';
 
+import { snakeToCamelCase } from './utils'
+
 const initialState = {
     isAuthenticated: false,
     isLoggingIn: false,
@@ -26,6 +28,17 @@ const initialState = {
     lastOrder: null,
 };
 
+
+function formatErrors(errs) {
+    let _errs = {};
+    for(let [key, value] of Object.entries(errs)) {
+        _errs[snakeToCamelCase(key)] = value.join('\n');
+    }
+    return _errs
+}
+
+
+
 export default function duskenApp(state = initialState, action) {
     switch (action.type) {
         /* Login */
@@ -80,7 +93,7 @@ export default function duskenApp(state = initialState, action) {
         case REGISTER_USER_FAILURE:
             return Object.assign({}, state, {
                 isRegisteringUser: false,
-                registerError: action.registerError
+                registerError: formatErrors(action.registerError)
             });
 
         case REGISTER_USER_SUCCESS:
diff --git a/src/utils.js b/src/utils.js
new file mode 100644
index 0000000..bcb5982
--- /dev/null
+++ b/src/utils.js
@@ -0,0 +1,3 @@
+export function snakeToCamelCase(val) {
+    return val.replace(/_([a-z])/g, function (g) { return g[1].toUpperCase(); });
+}
diff --git a/yarn.lock b/yarn.lock
index 2e1da5d..e28eb67 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1409,6 +1409,10 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
+email-validator@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-1.1.1.tgz#b07f3be7bac1dc099bc43e75f6ae399f552d5a80"
+
 encoding@^0.1.11:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
@@ -3546,9 +3550,9 @@ react-native-drawer-layout@1.3.2:
   dependencies:
     react-native-dismiss-keyboard "1.0.0"
 
-"react-native-drawer@git+https://github.com/GeekyAnts/react-native-drawer.git":
+"react-native-drawer@https://github.com/GeekyAnts/react-native-drawer":
   version "2.3.0"
-  resolved "git+https://github.com/GeekyAnts/react-native-drawer.git#8d9078516d177c9cb02d2579a6860706d2370d25"
+  resolved "https://github.com/GeekyAnts/react-native-drawer#8d9078516d177c9cb02d2579a6860706d2370d25"
   dependencies:
     prop-types "^15.5.8"
     tween-functions "^1.0.1"
@@ -3566,9 +3570,9 @@ react-native-htmlview@^0.12.0:
     entities "^1.1.1"
     htmlparser2-without-node-native "^3.9.0"
 
-"react-native-keyboard-aware-scroll-view@git+https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view.git":
+"react-native-keyboard-aware-scroll-view@https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view":
   version "0.2.9"
-  resolved "git+https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view.git#f4805f254d6cc8e3329f5fb224944401f66655db"
+  resolved "https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view#f4805f254d6cc8e3329f5fb224944401f66655db"
   dependencies:
     create-react-class "^15.6.0"
     prop-types "^15.5.10"