diff --git a/mascara/src/app/first-time/create-password-screen.js b/mascara/src/app/first-time/create-password-screen.js
index 102d8a7c3..17b9174b8 100644
--- a/mascara/src/app/first-time/create-password-screen.js
+++ b/mascara/src/app/first-time/create-password-screen.js
@@ -11,6 +11,8 @@ class CreatePasswordScreen extends Component {
     isLoading: PropTypes.bool.isRequired,
     createAccount: PropTypes.func.isRequired,
     history: PropTypes.object.isRequired,
+    isInitialized: PropTypes.bool,
+    isUnlocked: PropTypes.bool,
   }
 
   state = {
@@ -18,6 +20,13 @@ class CreatePasswordScreen extends Component {
     confirmPassword: '',
   }
 
+  componentWillMount () {
+    const { isInitialized, isUnlocked, history } = this.props
+    if (isInitialized || isUnlocked) {
+      history.push(DEFAULT_ROUTE)
+    }
+  }
+
   isValid () {
     const { password, confirmPassword } = this.state
 
@@ -107,8 +116,18 @@ class CreatePasswordScreen extends Component {
   }
 }
 
+const mapStateToProps = state => {
+  const { metamask: { isInitialized, isUnlocked }, appState: { isLoading } } = state
+
+  return {
+    isLoading,
+    isInitialized,
+    isUnlocked,
+  }
+}
+
 export default connect(
-  ({ appState: { isLoading } }) => ({ isLoading }),
+  mapStateToProps,
   dispatch => ({
     createAccount: password => dispatch(createNewVaultAndKeychain(password)),
   })
diff --git a/package.json b/package.json
index b7c35c053..06ff281ac 100644
--- a/package.json
+++ b/package.json
@@ -101,8 +101,8 @@
     "fast-json-patch": "^2.0.4",
     "fast-levenshtein": "^2.0.6",
     "fuse.js": "^3.2.0",
-    "gulp-autoprefixer": "^4.0.0",
     "gulp": "github:gulpjs/gulp#4.0",
+    "gulp-autoprefixer": "^4.0.0",
     "gulp-eslint": "^4.0.0",
     "gulp-sass": "^3.1.0",
     "hat": "0.0.3",
@@ -135,6 +135,7 @@
     "post-message-stream": "^3.0.0",
     "promise-filter": "^1.1.0",
     "promise-to-callback": "^1.0.0",
+    "prop-types": "^15.6.0",
     "pump": "^1.0.2",
     "pumpify": "^1.3.4",
     "qrcode-npm": "0.0.3",