diff --git a/webadmin/src/js/setup.js b/webadmin/src/js/setup.js
index 5b0246720..e9127d83a 100644
--- a/webadmin/src/js/setup.js
+++ b/webadmin/src/js/setup.js
@@ -28,11 +28,8 @@ app.config(['$routeProvider', function ($routeProvider) {
         controller: 'StepController',
         templateUrl: 'views/setup/step2.html'
     }).when('/step3', {
-        controller: 'StepController',
-        templateUrl: 'views/setup/step3.html'
-    }).when('/step4', {
         controller: 'FinishController',
-        templateUrl: 'views/setup/step4.html'
+        templateUrl: 'views/setup/step3.html'
     }).otherwise({ redirectTo: '/'});
 }]);
 
diff --git a/webadmin/src/views/setup/step1.html b/webadmin/src/views/setup/step1.html
index 6f1679c24..1af291b89 100644
--- a/webadmin/src/views/setup/step1.html
+++ b/webadmin/src/views/setup/step1.html
@@ -1,8 +1,47 @@
-<center>
-    <h1>Welcome to your Cloudron!</h1>
-    <br/>
-    <h3 class="">Let's personalize it a bit before you can install apps.</h3>
-    <br/>
-    <br/>
-    <a class="btn btn-primary" href="#/step2" autofocus>Next</a>
-</center>
+<div class="row">
+    <div class="col-md-12 text-center">
+        <h1>Welcome to your Cloudron!</h1>
+        <hr/>
+        <h3 class="">
+                Pick a name and avatar
+        </h3>
+    </div>
+</div>
+
+<br/>
+
+<div class="row">
+    <div class="col-md-4 col-md-offset-4 text-center">
+        <div class="form-group" ng-class="{ 'has-error': setup_form.name.$dirty && setup_form.name.$invalid }">
+            <!-- <label class="control-label" for="inputName">Name</label> -->
+            <input type="text" class="form-control" ng-model="wizard.name" id="inputName" name="name" placeholder="Name" ng-enter="next('/step3', setup_form.name.$invalid)" ng-maxlength="512" ng-minlength="1" autofocus required autocomplete="off">
+        </div>
+    </div>
+</div>
+
+
+<br/>
+
+<div class="row">
+    <div class="col-md-12 settings-avatar-selector">
+        <img id="previewAvatar" width="128" height="128" ng-src="{{wizard.avatar.data || wizard.avatar.url}}"/>
+        <input type="file" id="avatarFileInput" style="display: none" accept="image/png"/>
+
+        <br/>
+
+        <div class="grid">
+            <div class="item" ng-repeat="avatar in wizard.availableAvatars" style="background-image: url('{{avatar.data || avatar.url}}');" ng-click="wizard.setPreviewAvatar(avatar)"></div>
+            <div class="item add" ng-click="showCustomAvatarSelector()"></div>
+        </div>
+    </div>
+</div>
+
+<br/>
+<br/>
+
+
+<div class="row">
+    <div class="col-md-12 text-center">
+        <a class="btn btn-primary" href="#/step2" ng-disabled="setup_form.name.$invalid">Next</a>
+    </div>
+</div>
diff --git a/webadmin/src/views/setup/step2.html b/webadmin/src/views/setup/step2.html
index d3189d5a1..6997bb388 100644
--- a/webadmin/src/views/setup/step2.html
+++ b/webadmin/src/views/setup/step2.html
@@ -1,44 +1,27 @@
 <div class="row">
     <div class="col-md-12 text-center">
-        <h1>Select an avatar and name for your Cloudron</h1>
-        <hr/>
+        <h1>Create an Administrator for <b>{{ wizard.name }}</b></h1>
         <h4 class="">
-                We use these for display purposes.
+            This admin account is separate from your <a href="https://cloudron.io">cloudron.io</a> account.
         </h4>
     </div>
 </div>
-
 <br/>
-
-<div class="row">
-    <div class="col-md-12 settings-avatar-selector">
-        <img id="previewAvatar" width="128" height="128" ng-src="{{wizard.avatar.data || wizard.avatar.url}}"/>
-        <input type="file" id="avatarFileInput" style="display: none" accept="image/png"/>
-
-        <br/>
-        <br/>
-
-        <div class="grid">
-            <div class="item" ng-repeat="avatar in wizard.availableAvatars" style="background-image: url('{{avatar.data || avatar.url}}');" ng-click="wizard.setPreviewAvatar(avatar)"></div>
-            <div class="item add" ng-click="showCustomAvatarSelector()"></div>
-        </div>
-    </div>
-</div>
-
 <br/>
-
 <div class="row">
     <div class="col-md-4 col-md-offset-4 text-center">
-        <div class="form-group" ng-class="{ 'has-error': setup_form.name.$dirty && setup_form.name.$invalid }">
-            <!-- <label class="control-label" for="inputName">Name</label> -->
-            <input type="text" class="form-control" ng-model="wizard.name" id="inputName" name="name" placeholder="Name" ng-enter="next('/step3', setup_form.name.$invalid)" ng-maxlength="512" ng-minlength="1" autofocus required autocomplete="off">
+        <div class="form-group" ng-class="{ 'has-error': setup_form.username.$dirty && setup_form.username.$invalid }">
+            <!-- <label class="control-label" for="inputUsername">Username</label> -->
+            <input type="text" class="form-control" ng-model="wizard.username" id="inputUsername" name="username" placeholder="Username" ng-enter="focusNext('inputPassword', setup_form.username.$invalid)" ng-maxlength="512" ng-minlength="3" autofocus required autocomplete="off">
+        </div>
+        <div class="form-group" ng-class="{ 'has-error': setup_form.password.$dirty && setup_form.password.$invalid }">
+            <!-- <label class="control-label" for="inputPassword">Password</label> -->
+            <input type="password" class="form-control" ng-model="wizard.password" id="inputPassword" name="password" placeholder="Password" ng-enter="next('/step4', setup_form.password.$invalid)" ng-maxlength="512" ng-minlength="5" required autocomplete="off">
         </div>
     </div>
 </div>
-
-
 <div class="row">
     <div class="col-md-12 text-center">
-        <a class="btn btn-primary" href="#/step3" ng-disabled="setup_form.name.$invalid">Next</a>
+        <a class="btn btn-primary" href="#/step3" ng-disabled="setup_form.username.$invalid">Done</a>
     </div>
 </div>
diff --git a/webadmin/src/views/setup/step3.html b/webadmin/src/views/setup/step3.html
index 1cf3f0098..c8e84f748 100644
--- a/webadmin/src/views/setup/step3.html
+++ b/webadmin/src/views/setup/step3.html
@@ -1,26 +1,8 @@
-<div class="row">
-    <div class="col-md-12 text-center">
-        <h1>Create an Administrator for <b>{{ wizard.name }}</b></h1>
-        <h4 class="">
-            This admin account is separate from your <a href="https://cloudron.io">cloudron.io</a> account.
-        </h4>
-    </div>
-</div>
-<br/>
-<div class="row">
-    <div class="col-md-4 col-md-offset-4 text-center">
-        <div class="form-group" ng-class="{ 'has-error': setup_form.username.$dirty && setup_form.username.$invalid }">
-            <!-- <label class="control-label" for="inputUsername">Username</label> -->
-            <input type="text" class="form-control" ng-model="wizard.username" id="inputUsername" name="username" placeholder="Username" ng-enter="focusNext('inputPassword', setup_form.username.$invalid)" ng-maxlength="512" ng-minlength="3" autofocus required autocomplete="off">
-        </div>
-        <div class="form-group" ng-class="{ 'has-error': setup_form.password.$dirty && setup_form.password.$invalid }">
-            <!-- <label class="control-label" for="inputPassword">Password</label> -->
-            <input type="password" class="form-control" ng-model="wizard.password" id="inputPassword" name="password" placeholder="Password" ng-enter="next('/step4', setup_form.password.$invalid)" ng-maxlength="512" ng-minlength="5" required autocomplete="off">
-        </div>
-    </div>
-</div>
-<div class="row">
-    <div class="col-md-12 text-center">
-        <a class="btn btn-primary" href="#/step4" ng-disabled="setup_form.username.$invalid">Done</a>
-    </div>
-</div>
+<center>
+    <h1>All done!</h1>
+    <br/>
+    <br/>
+    <i class="fa fa-spinner fa-pulse fa-5x"></i>
+    <br/>
+    <br/>
+</center>
diff --git a/webadmin/src/views/setup/step4.html b/webadmin/src/views/setup/step4.html
deleted file mode 100644
index c8e84f748..000000000
--- a/webadmin/src/views/setup/step4.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<center>
-    <h1>All done!</h1>
-    <br/>
-    <br/>
-    <i class="fa fa-spinner fa-pulse fa-5x"></i>
-    <br/>
-    <br/>
-</center>