diff --git a/css/src/mobile.css b/css/src/mobile.css
index 5034328b9..300d373d8 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -198,10 +198,6 @@
     padding: 1rem 1.2rem 1.0625rem;
   }
 
-  form {
-    margin: 0;
-  }
-
   .box-setup {
     margin-bottom: 50px;
   }
diff --git a/js/controllers/createProfile.js b/js/controllers/createProfile.js
index 13dcd9dd5..6bdad77a7 100644
--- a/js/controllers/createProfile.js
+++ b/js/controllers/createProfile.js
@@ -40,12 +40,14 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
     preconditions.checkArgument(pin);
     preconditions.checkState($rootScope.iden);
     preconditions.checkState(_credentials && _credentials.email);
+    $scope.loading = true;
 
     pinService.save(pin, _credentials.email, _credentials.password, function(err) {
       _credentials.password = '';
       _credentials = null;
       $scope.askForPin = 0;
       $rootScope.hasPin = true;
+      $scope.loading = null;
       $scope.createDefaultWallet();
     });
   };
@@ -106,7 +108,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
     $scope.loading = true;
 
     identityService.create(emailOrUsername, password, function(err) {
-      $scope.loading = false;
+      $scope.loading = null;
       $scope.error = null;
       if (err) {
         var msg = err.toString();
diff --git a/js/controllers/home.js b/js/controllers/home.js
index 9a2d99e17..abe9744b8 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -67,6 +67,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
       $scope.error = 'Please enter the required fields';
       return;
     }
+    $scope.loading = true;
     $rootScope.starting = true;
 
     var credentials = pinService.get(pin, function(err, credentials) {
@@ -93,12 +94,14 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
     preconditions.checkArgument(pin);
     preconditions.checkState($rootScope.iden);
     preconditions.checkState(_credentials && _credentials.email);
+    $scope.loading = true;
 
     pinService.save(pin, _credentials.email, _credentials.password, function(err) {
       _credentials.password = '';
       _credentials = null;
       $scope.askForPin = 0;
       $rootScope.hasPin = true;
+      $scope.loading = null;
       $scope.openWallets();
     });
   };
diff --git a/js/services/pinService.js b/js/services/pinService.js
index 726a2b4f4..6329e7ce5 100644
--- a/js/services/pinService.js
+++ b/js/services/pinService.js
@@ -59,7 +59,6 @@ angular.module('copayApp.services')
             scope.error = null;
             scope.loading = null;
             if (newValue && newValue.length == 4) {
-              scope.loading = true;
               $timeout(function() {
                 return cb(newValue);
               }, 30);
diff --git a/views/createProfile.html b/views/createProfile.html
index 9c52b233c..84e45a0b1 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -233,7 +233,9 @@
           </a>
         </div>
         <div class="large-6 medium-6 small-6 columns text-right">
-          <button translate type="submit" class="button primary radius expand m0" ng-disabled="setPinForm.$invalid || error">
+          <button translate type="submit" class="button primary radius expand m0" 
+            ng-disabled="setPinForm.$invalid || error || loading">
+            <i class="fi-bitcoin-circle icon-rotate spinner" ng-show="loading"></i> 
             OK
           </button>
         </div>
diff --git a/views/home.html b/views/home.html
index e6d096795..268c39882 100644
--- a/views/home.html
+++ b/views/home.html
@@ -68,7 +68,9 @@
             </a>
           </div>
           <div class="large-6 medium-6 small-6 columns text-right">
-            <button translate type="submit" class="button primary radius expand m0" ng-disabled="setPinForm.$invalid || error">
+            <button translate type="submit" class="button primary radius expand m0" 
+              ng-disabled="setPinForm.$invalid || error || loading">
+              <i class="fi-bitcoin-circle icon-rotate spinner" ng-show="loading"></i> 
               OK
             </button>
           </div>