diff --git a/src/js/controllers/coinbase.js b/src/js/controllers/coinbase.js
index 3492245c6..313e35c9b 100644
--- a/src/js/controllers/coinbase.js
+++ b/src/js/controllers/coinbase.js
@@ -12,7 +12,9 @@ angular.module('copayApp.controllers').controller('coinbaseController', function
       $scope.accessToken = at;
       
       // Update Access Token if necessary
+      $scope.loading = true;
       coinbaseService.init(function(err, data) {
+        $scope.loading = false;
         if (err || lodash.isEmpty(data)) {
           if (err) {
             popupService.showAlert(gettextCatalog.getString('Error'), err);
diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js
index b78fc0e3d..a92d8cb6c 100644
--- a/src/js/controllers/tab-settings.js
+++ b/src/js/controllers/tab-settings.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, appConfigService, $window, $log, lodash, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService, bitpayCardService, storageService, glideraService, coinbaseService, gettextCatalog) {
+angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, appConfigService, $log, lodash, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService, bitpayCardService, storageService, glideraService, coinbaseService, gettextCatalog) {
 
   var updateConfig = function() {
     var isCordova = platformInfo.isCordova;
@@ -44,9 +44,8 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
 
       if ($scope.coinbaseEnabled) {
         coinbaseService.setCredentials();
-        storageService.getCoinbaseToken(coinbaseService.getNetwork(), function(err, token) {
-          if (err) $log.error(err);
-          $scope.coinbaseToken = token;
+        coinbaseService.getStoredToken(function(at) {
+          $scope.coinbaseToken = at;
         });
       }
 
diff --git a/www/views/coinbase.html b/www/views/coinbase.html
index 48cc8a7c0..b2a687880 100644
--- a/www/views/coinbase.html
+++ b/www/views/coinbase.html
@@ -86,7 +86,7 @@
     <div class="list card">
       <div class="item item-heading" ng-click="updateTransactions()">
         Activity
-      </div>
+      </div> 
       <a class="item"
          ng-if="pendingTransactions.data && !error"
          ng-repeat="(id, tx) in pendingTransactions.data | orderObjectBy:'updated_at':true track by $index"
@@ -121,6 +121,9 @@
         </p>
       </a>
     </div>
+    <div class="m10t text-center" ng-if="loading">
+      <ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
+    </div>
 
   </div>
   </ion-content>