diff --git a/webadmin/src/js/setup.js b/webadmin/src/js/setup.js
index 0286c3653..66c18411c 100644
--- a/webadmin/src/js/setup.js
+++ b/webadmin/src/js/setup.js
@@ -46,6 +46,7 @@ app.service('Wizard', [ function () {
         this.displayName = '';
         this.setupToken = null;
         this.provider = null;
+        this.createAppstoreAccount = true;
         this.availableAvatars = [{
             file: null,
             data: null,
diff --git a/webadmin/src/views/setup/step2.html b/webadmin/src/views/setup/step2.html
index eb9f49f8d..412015706 100644
--- a/webadmin/src/views/setup/step2.html
+++ b/webadmin/src/views/setup/step2.html
@@ -1,9 +1,6 @@
 <div class="row">
     <div class="col-md-12 text-center">
         <h1>Create an Administrator for your Cloudron</h1>
-        <h4 class="">
-            This admin account is separate from your <a href="https://cloudron.io">cloudron.io</a> account.
-        </h4>
     </div>
 </div>
 <br/>
@@ -25,6 +22,13 @@
                 <small ng-show="setup_form.password.$dirty && setup_form.password.$invalid">Password must be 8-30 character with at least one uppercase, one numeric and one special character</small>
             </div>
         </div>
+        <div class="form-group">
+            <div class="checkbox">
+                <label>
+                    <input type="checkbox" ng-model="wizard.createAppstoreAccount"> Create Cloudron store account with the same credentials
+                </label>
+            </div>
+        </div>
     </div>
 </div>
 <div class="row">