diff --git a/src/popup/app/accounts/views/accountsLogin.html b/src/popup/app/accounts/views/accountsLogin.html
index adf08979920..9a7f2b6646e 100644
--- a/src/popup/app/accounts/views/accountsLogin.html
+++ b/src/popup/app/accounts/views/accountsLogin.html
@@ -1,7 +1,7 @@
 <form name="theForm" ng-submit="theForm.$valid && login(model, theForm)" bit-form="loginPromise">
     <div class="header">
         <div class="left">
-            <a ng-click="close()" href="">Cancel</a>
+            <a ui-sref="home({animation: 'out-slide-down'})">Cancel</a>
         </div>
         <div class="right">
             <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">Log In</button>
diff --git a/src/popup/app/config.js b/src/popup/app/config.js
index 7bc93e63bd2..415c7e7e4da 100644
--- a/src/popup/app/config.js
+++ b/src/popup/app/config.js
@@ -29,10 +29,25 @@
 
         $urlRouterProvider.otherwise(function ($injector, $location) {
             var $state = $injector.get('$state');
-            $state.go('login');
+            $state.go('splash');
         });
 
         $stateProvider
+            .state('splash', {
+                url: '/splash',
+                controller: 'splashController',
+                templateUrl: 'app/global/splash.html',
+                data: { authorize: false },
+                params: { animation: null }
+            })
+            .state('home', {
+                url: '/home',
+                controller: 'homeController',
+                templateUrl: 'app/global/home.html',
+                data: { authorize: false },
+                params: { animation: null }
+            })
+
             .state('login', {
                 url: '/login',
                 controller: 'accountsLoginController',
@@ -139,7 +154,7 @@
                     if (!isAuthenticated || tokenService.isTokenExpired(token)) {
                         event.preventDefault();
                         loginService.logOut(function () {
-                            $state.go('login');
+                            $state.go('home');
                         });
                     }
                 });
diff --git a/src/popup/app/global/globalModule.js b/src/popup/app/global/globalModule.js
index 6670e2ba92d..4e60c9109fd 100644
--- a/src/popup/app/global/globalModule.js
+++ b/src/popup/app/global/globalModule.js
@@ -1,2 +1,2 @@
 angular
-    .module('bit.global', []);
+    .module('bit.global', ['ngAnimate']);
diff --git a/src/popup/app/global/home.html b/src/popup/app/global/home.html
new file mode 100644
index 00000000000..afb1eebc539
--- /dev/null
+++ b/src/popup/app/global/home.html
@@ -0,0 +1,14 @@
+<div class="content">
+    <div class="home-page">
+        <img src="../../../../images/logo@3x.png" alt="bitwarden" />
+        <p>Log in or create a new account to access your secure vault.</p>
+        <div class="buttons">
+            <a class="btn btn-lg btn-primary btn-block" ui-sref="">
+                <b>Create Account</b>
+            </a>
+            <a class="btn btn-lg btn-link btn-block" ui-sref="login({animation: 'in-slide-up'})">
+                Log In
+            </a>
+        </div>
+    </div>
+</div>
diff --git a/src/popup/app/global/homeController.js b/src/popup/app/global/homeController.js
new file mode 100644
index 00000000000..dec8f9534b0
--- /dev/null
+++ b/src/popup/app/global/homeController.js
@@ -0,0 +1,6 @@
+angular
+    .module('bit.global')
+
+    .controller('homeController', function ($scope) {
+
+    });
diff --git a/src/popup/app/global/splash.html b/src/popup/app/global/splash.html
new file mode 100644
index 00000000000..ae68eeeb391
--- /dev/null
+++ b/src/popup/app/global/splash.html
@@ -0,0 +1,5 @@
+<div class="content">
+    <div class="splash-page">
+        <img src="../../../../images/logo@3x.png" alt="bitwarden" />
+    </div>
+</div>
diff --git a/src/popup/app/global/splashController.js b/src/popup/app/global/splashController.js
new file mode 100644
index 00000000000..e8cf550ec64
--- /dev/null
+++ b/src/popup/app/global/splashController.js
@@ -0,0 +1,6 @@
+angular
+    .module('bit.global')
+
+    .controller('splashController', function ($scope) {
+
+    });
diff --git a/src/popup/index.html b/src/popup/index.html
index 511f9d7d5ef..8ce70e54ca6 100644
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -47,6 +47,8 @@
     <script src="app/global/globalModule.js"></script>
     <script src="app/global/mainController.js"></script>
     <script src="app/global/tabsController.js"></script>
+    <script src="app/global/splashController.js"></script>
+    <script src="app/global/homeController.js"></script>
 
     <script src="app/accounts/accountsModule.js"></script>
     <script src="app/accounts/accountsLoginController.js"></script>
diff --git a/src/popup/less/components.less b/src/popup/less/components.less
index 71a4be8f3d2..55d41e45cb0 100644
--- a/src/popup/less/components.less
+++ b/src/popup/less/components.less
@@ -374,6 +374,12 @@
     }
 }
 
+.btn {
+    border-radius: 0;
+    -webkit-border-radius: 0;
+    -moz-border-radius: 0;
+}
+
 .generate-password-block {
     margin: 20px;
     font-size: 19px;
@@ -394,3 +400,39 @@
         display: block;
     }
 }
+
+.home-page {
+    padding: 120px 20px 20px;
+    text-align: center;
+    position: relative;
+    height: 100%;
+
+    img {
+        margin: 0 auto 30px;
+        width: 250px;
+        display: block;
+    }
+
+    p {
+        font-size: 18px;
+    }
+
+    .buttons {
+        position: absolute;
+        bottom: 0;
+        width: 100%;
+        left: 0;
+        padding: 20px;
+    }
+}
+
+.splash-page {
+    text-align: center;
+    padding: 160px 20px 0;
+
+    img {
+        width: 250px;
+        display: block;
+        margin: 0 auto;
+    }
+}