diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html
index ec96a356a..81e0af61d 100644
--- a/public/views/disclaimer.html
+++ b/public/views/disclaimer.html
@@ -1,5 +1,4 @@
 <div class="splash content text-center"
-  ng-init="init()"
   ng-controller="disclaimerController">
   <div>
     <div class="row">
diff --git a/src/js/controllers/disclaimer.js b/src/js/controllers/disclaimer.js
index 5cc6c4d51..b428aa19a 100644
--- a/src/js/controllers/disclaimer.js
+++ b/src/js/controllers/disclaimer.js
@@ -6,11 +6,13 @@ angular.module('copayApp.controllers').controller('disclaimerController',
     $scope.lang = uxLanguage.currentLanguage;
 
     $scope.goHome = function() {
-      storageService.getProfile(function(err, profile) {
-        profile.agreeDisclaimer = true;
-        storageService.storeProfile(profile, function() {
-          go.walletHome();
-        });
+      $scope.error = "";
+      profileService.storeDisclaimer(function(err) {
+        if (err) {
+          $scope.error = err;
+          $log.warn(err);
+          $scope.$apply();
+        } else go.walletHome();
       });
     };
 
@@ -20,19 +22,12 @@ angular.module('copayApp.controllers').controller('disclaimerController',
 
         if (err) {
           $log.warn(err);
-          if (err == 'EEXISTS') {
-
-            if (profileService.profile.agreeDisclaimer) return go.walletHome();
-            $scope.creatingProfile = false;
-
-          } else {
-            $scope.error = err;
-            $scope.$apply();
-            $timeout(function() {
-              $log.warn('Retrying to create profile......');
-              create();
-            }, 3000);
-          }
+          $scope.error = err;
+          $scope.$apply();
+          $timeout(function() {
+            $log.warn('Retrying to create profile......');
+            create();
+          }, 3000);
         } else {
           $scope.error = "";
           $scope.creatingProfile = false;
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index c94aa4ebc..70efa5d15 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -516,6 +516,15 @@ angular.module('copayApp.services')
       });
     };
 
+    root.storeDisclaimer = function(cb) {
+      storageService.getProfile(function(err, profile) {
+        profile.agreeDisclaimer = true;
+        storageService.storeProfile(profile, function() {
+          return cb(err);
+        });
+      });
+    }
+
     root.importLegacyWallet = function(username, password, blob, cb) {
       var walletClient = bwcService.getClient();