diff --git a/public/views/splash.html b/public/views/splash.html
index 754e969b6..6354688bd 100644
--- a/public/views/splash.html
+++ b/public/views/splash.html
@@ -1,39 +1,43 @@
-<div class="splash content text-center" ng-if="!index.hasProfile" ng-controller="splashController">
-	<div class="row">
-		<div class="medium-centered small-centered large-centered columns">
-			<div class="m20t">
-				<span class="text-bold size-16 text-white" translate>WELCOME TO COPAY</span>
-				<p class="text-gray size-14 m0 text-light" translate>A multisignature bitcoin wallet</p>
-			</div>
-		</div>
-	</div>
-	<div class="row">
-		<div class="container-image large-3 medium-3 small-3 medium-centered small-centered large-centered columns">
-		<img src="img/icon-splash.png" alt="icon" width="100%">
-	</div>
-	</div>
-  <div class="text-center size-12 text-warning" ng-show="error && !creatingProfile">
-    {{(error)|translate}}. <span translate>Retrying...</span>
-  </div>
-  <div class="onGoingProcess" ng-show="creatingProfile">
-    <div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
-      <div class="spinner">
-        <div class="rect1"></div>
-        <div class="rect2"></div>
-        <div class="rect3"></div>
-        <div class="rect4"></div>
-        <div class="rect5"></div>
+<div class="splash content text-center" 
+  ng-init="init()" 
+  ng-controller="splashController">
+  <div ng-if="!index.hasProfile">
+    <div class="row">
+      <div class="medium-centered small-centered large-centered columns">
+        <div class="m20t">
+          <span class="text-bold size-16 text-white" translate>WELCOME TO COPAY</span>
+          <p class="text-gray size-14 m0 text-light" translate>A multisignature bitcoin wallet</p>
+        </div>
       </div>
-      <span translate>Creating Profile...</span>
     </div>
-  </div>
-  <div class="row" ng-show="!creatingProfile">
-		<div class="start-button large-8 medium-8 small-8 medium-centered small-centered large-centered columns">
-      <button ng-click="create()" class="button black expand round size-12 text-spacing" translate>
-        GET STARTED
-      </button>
-      <p class="text-gray m5b size-12" translate>Already have a wallet?</p>
-      <button  ng-click="create(true)" class="button round outline dark-gray tiny" translate>Import backup </button>
+    <div class="row">
+      <div class="container-image large-3 medium-3 small-3 medium-centered small-centered large-centered columns">
+      <img src="img/icon-splash.png" alt="icon" width="100%">
+    </div>
+    </div>
+    <div class="text-center size-12 text-warning" ng-show="error && !creatingProfile">
+      {{(error)|translate}}. <span translate>Retrying...</span>
+    </div>
+    <div class="onGoingProcess" ng-show="creatingProfile">
+      <div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
+        <div class="spinner">
+          <div class="rect1"></div>
+          <div class="rect2"></div>
+          <div class="rect3"></div>
+          <div class="rect4"></div>
+          <div class="rect5"></div>
+        </div>
+        <span translate>Creating Profile...</span>
+      </div>
+    </div>
+    <div class="row" ng-show="!creatingProfile">
+      <div class="start-button large-8 medium-8 small-8 medium-centered small-centered large-centered columns">
+        <button ng-click="create()" class="button black expand round size-12 text-spacing" translate>
+          GET STARTED
+        </button>
+        <p class="text-gray m5b size-12" translate>Already have a wallet?</p>
+        <button  ng-click="create(true)" class="button round outline dark-gray tiny" translate>Import backup </button>
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/js/controllers/splash.js b/src/js/controllers/splash.js
index 87ab843ed..b52b2d443 100644
--- a/src/js/controllers/splash.js
+++ b/src/js/controllers/splash.js
@@ -1,15 +1,8 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('splashController',
-  function($scope, $timeout, $log, profileService, storageService, go, bwcService) {
-    storageService.getCopayDisclaimerFlag(function(err, val) {
-      if (!val) go.path('disclaimer');
-
-      if (profileService.profile) {
-        go.walletHome();
-      }
-    });
-
+  function($scope, $timeout, $log, profileService, storageService, go) {
+    
     $scope.create = function(noWallet) {
       $scope.creatingProfile = true;
 
@@ -29,4 +22,14 @@ angular.module('copayApp.controllers').controller('splashController',
         });
       }, 100);
     };
+
+    $scope.init = function() {
+      storageService.getCopayDisclaimerFlag(function(err, val) {
+        if (!val) go.path('disclaimer');
+        
+        if (profileService.profile) {
+          go.walletHome();
+        }
+      });
+    };
   });
diff --git a/src/js/services/confirmDialog.js b/src/js/services/confirmDialog.js
index 47d3ca358..b8242dc5c 100644
--- a/src/js/services/confirmDialog.js
+++ b/src/js/services/confirmDialog.js
@@ -1,7 +1,7 @@
 
 'use strict';
 
-angular.module('copayApp.services').factory('confirmDialog', function($log, profileService, configService, gettextCatalog, isCordova, isChromeApp) {
+angular.module('copayApp.services').factory('confirmDialog', function($log, $timeout, profileService, configService, gettextCatalog, isCordova, isChromeApp) {
   var root = {};