diff --git a/src/views/settings.js b/src/views/settings.js
index 4bc059e2c..a2427fef4 100644
--- a/src/views/settings.js
+++ b/src/views/settings.js
@@ -757,20 +757,19 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
             $scope.currentPlan = $scope.config.plan;
             $scope.currency = $scope.config.currency === 'eur' ? '€' : '$';
         } else {
-            Client.getAppstoreConfig(function (error, result) {
+            Client.getAppstoreConfig(function (error, appstoreConfig) {
                 if (error) return console.error(error);
+                if (!appstoreConfig.token) return;
 
-                if (result.token) {
-                    $scope.appstoreConfig = result;
+                AppStore.getProfile(appstoreConfig.token, function (error, result) {
+                    if (error) return console.error(error);
 
-                    AppStore.getProfile(result.token, function (error, result) {
-                        if (error) return console.error(error);
+                    // assign late to avoid UI flicketing on update
+                    appstoreConfig.profile = result;
+                    $scope.appstoreConfig = appstoreConfig;
 
-                        $scope.appstoreConfig.profile = result;
-
-                        getSubscription();
-                    });
-                }
+                    getSubscription();
+                });
             });
         }
     });