diff --git a/webadmin/src/js/setup.js b/webadmin/src/js/setup.js
index c32169ea8..d8965d034 100644
--- a/webadmin/src/js/setup.js
+++ b/webadmin/src/js/setup.js
@@ -118,17 +118,16 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope
                 return;
             }
 
+            // for caas we are done here
+            if ($scope.provider === 'caas') {
+                window.location.href = '/';
+                return;
+            }
+
             registerAppstoreAccountIfNeeded(function (error) {
                 if (error) console.error('Unable to create appstore account.', error);  // this is not fatal
 
                 $scope.busy = false;
-
-                // for caas we are done here
-                if ($scope.provider === 'caas') {
-                    window.location.href = '/';
-                    return;
-                }
-
                 $scope.showDNSSetup = true;
             });
         });