diff --git a/docker-compose.yml b/docker-compose.yml
index 58c046c32..9a57617dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,8 +4,8 @@ metamascara:
ports:
- "9001"
environment:
- MASCARA_ORIGIN: "https://zero.metamask.io"
+ MASCARA_ORIGIN: "https://wallet.metamask.io"
VIRTUAL_PORT: "9001"
- VIRTUAL_HOST: "zero.metamask.io"
- LETSENCRYPT_HOST: "zero.metamask.io"
+ VIRTUAL_HOST: "wallet.metamask.io"
+ LETSENCRYPT_HOST: "wallet.metamask.io"
LETSENCRYPT_EMAIL: "admin@metamask.io"
\ No newline at end of file
diff --git a/mascara/src/app/first-time/create-password-screen.js b/mascara/src/app/first-time/create-password-screen.js
index 2f4b81e7c..21d29d72b 100644
--- a/mascara/src/app/first-time/create-password-screen.js
+++ b/mascara/src/app/first-time/create-password-screen.js
@@ -1,8 +1,10 @@
+import EventEmitter from 'events'
import React, {Component, PropTypes} from 'react'
import {connect} from 'react-redux';
import {createNewVaultAndKeychain} from '../../../../ui/app/actions'
import LoadingScreen from './loading-screen'
import Breadcrumbs from './breadcrumbs'
+import Mascot from '../../../../ui/app/components/mascot'
class CreatePasswordScreen extends Component {
static propTypes = {
@@ -18,6 +20,11 @@ class CreatePasswordScreen extends Component {
confirmPassword: ''
}
+ constructor () {
+ super()
+ this.animationEventEmitter = new EventEmitter()
+ }
+
isValid() {
const {password, confirmPassword} = this.state;
@@ -50,52 +57,70 @@ class CreatePasswordScreen extends Component {
return isLoading
?