diff --git a/webadmin/src/js/setup.js b/webadmin/src/js/setup.js
index 25d7bb6b3..b2073f5eb 100644
--- a/webadmin/src/js/setup.js
+++ b/webadmin/src/js/setup.js
@@ -232,6 +232,7 @@ app.controller('FinishController', ['$scope', '$location', '$http', 'Wizard', 'C
 
     function registerAppstoreAccountIfNeeded(callback) {
         if (!Wizard.createAppstoreAccount) return callback(null);
+        if (Wizard.provider === 'caas') return callback(null);
 
         $http.post(Wizard.apiServerOrigin + '/api/v1/users', { email: Wizard.email, password: Wizard.password }).success(function (data, status) {
             if (status !== 201) return callback({ status: status, data: data });
diff --git a/webadmin/src/views/setup/step2.html b/webadmin/src/views/setup/step2.html
index 65434b57f..61f422651 100644
--- a/webadmin/src/views/setup/step2.html
+++ b/webadmin/src/views/setup/step2.html
@@ -24,7 +24,7 @@
         </div>
     </div>
 </div>
-<div class="row">
+<div class="row" ng-hide="wizard.provider === 'caas'">
     <div class="col-md-12 text-center">
         <div class="form-group">
             <div class="checkbox">