diff --git a/src/js/setup.js b/src/js/setup.js
index d21845b15..33a7766cf 100644
--- a/src/js/setup.js
+++ b/src/js/setup.js
@@ -12,56 +12,40 @@ app.controller('SetupController', ['$scope', 'Client', function ($scope, Client)
 
     $scope.client = Client;
     $scope.view = '';
-    $scope.busy = true;
-    $scope.account = {
-        email: '',
-        displayName: '',
-        requireEmail: true,
-        username: '',
-        password: ''
-    };
-    $scope.error = null;
+    $scope.initialized = false;
     $scope.apiServerOrigin = '';
     $scope.webServerOrigin = '';
 
-    $scope.activateCloudron = function () {
-        $scope.busy = true;
-        $scope.error = null;
-
-        Client.createAdmin($scope.account.username, $scope.account.password, $scope.account.email, $scope.account.displayName, function (error) {
-            if (error && error.statusCode === 400) {
-                $scope.busy = false;
-                $scope.error = { username: error.message };
-                $scope.account.username = '';
-                $scope.ownerForm.username.$setPristine();
-                setTimeout(function () { $('#inputUsername').focus(); }, 200);
-                return;
-            } else if (error) {
-                $scope.busy = false;
-                console.error('Internal error', error);
-                $scope.error = { generic: error.message };
-                return;
-            }
-
-            window.location.href = '/';
-        });
-    };
-
-    $scope.email = {
+    $scope.owner = {
         error: null,
         busy: false,
 
-        submit: function () {
-
-        }
-    };
-
-    $scope.invite = {
-        error: null,
-        busy: false,
+        email: '',
+        displayName: '',
+        username: '',
+        password: '',
 
         submit: function () {
+            $scope.owner.busy = true;
+            $scope.owner.error = null;
 
+            Client.createAdmin($scope.owner.username, $scope.owner.password, $scope.owner.email, $scope.owner.displayName, function (error) {
+                if (error && error.statusCode === 400) {
+                    $scope.owner.busy = false;
+                    $scope.owner.error = { username: error.message };
+                    $scope.owner.username = '';
+                    $scope.ownerForm.username.$setPristine();
+                    setTimeout(function () { $('#inputUsername').focus(); }, 200);
+                    return;
+                } else if (error) {
+                    $scope.owner.busy = false;
+                    console.error('Internal error', error);
+                    $scope.owner.error = { generic: error.message };
+                    return;
+                }
+
+                window.location.href = '/';
+            });
         }
     };
 
@@ -90,11 +74,12 @@ app.controller('SetupController', ['$scope', 'Client', function ($scope, Client)
         }
     }
 
-    function setView() {
-        if (search.view === 'owner') $scope.view = 'owner';
-        else if (search.view === 'email') $scope.view = 'email';
-        else if (search.view === 'invite') $scope.view = 'invite';
-        else $scope.view = 'owner';
+    function setView(view) {
+        if (view === 'finished') {
+            $scope.view = 'finished';
+        } else {
+            $scope.view = 'owner';
+        }
     }
 
     function init() {
@@ -102,12 +87,12 @@ app.controller('SetupController', ['$scope', 'Client', function ($scope, Client)
             if (error) return Client.initError(error, init);
 
             redirectIfNeeded(status);
-            setView();
+            setView(search.view);
 
             $scope.apiServerOrigin = status.apiServerOrigin;
             $scope.webServerOrigin = status.webServerOrigin;
 
-            $scope.busy = false;
+            $scope.initialized = true;
 
             // Ensure we have a good autofocus
             setTimeout(function () {
diff --git a/src/setup.html b/src/setup.html
index 38b2bbf53..cef7cc0a9 100644
--- a/src/setup.html
+++ b/src/setup.html
@@ -42,22 +42,15 @@
 
   <a class="offline-banner animateMe" ng-show="client.offline" ng-cloak href="https://cloudron.io/documentation/troubleshooting/" target="_blank"><i class="fa fa-circle-notch fa-spin"></i> Cloudron is offline. Reconnecting...</a>
 
-  <div class="main-container">
-
-    <div class="row text-center" ng-show="busy">
-      <div class="col-md-6 col-md-offset-3">
-        <i class="fa fa-circle-notch fa-spin fa-5x"></i>
-      </div>
-    </div>
-
-    <div class="row" ng-show="!busy && view === 'owner'">
+  <div class="main-container" ng-show="initialized">
+    <div class="row" ng-show="view === 'owner'">
       <div class="col-md-6 col-md-offset-3">
         <div class="card" style="max-width: none; padding: 20px;">
-          <form role="form" name="ownerForm" ng-submit="activateCloudron()" novalidate>
+          <form role="form" name="ownerForm" ng-submit="owner.submit()" novalidate>
             <div class="row">
               <div class="col-md-12 text-center">
                 <h1>Welcome to Cloudron</h1>
-                <h3>Setup Owner Account</h3>
+                <h3>Setup Admin Account</h3>
               </div>
             </div>
             <br/>
@@ -65,21 +58,22 @@
             <div class="row">
               <div class="col-md-8 col-md-offset-2">
                 <div class="form-group" ng-class="{ 'has-error': ownerForm.displayName.$dirty && ownerForm.displayName.$invalid }">
-                  <label class="control-label">Full Name</label>
-                  <input type="text" class="form-control" ng-model="account.displayName" id="inputDisplayName" name="displayName" placeholder="Full Name" required autocomplete="off" autofocus>
+                  <label class="control-label" for="inputDisplayName">Full Name</label>
+                  <input type="text" class="form-control" ng-model="owner.displayName" id="inputDisplayName" name="displayName" placeholder="Full Name" required autocomplete="off" ng-disabled="owner.busy" autofocus>
                 </div>
-                <div ng-show="account.requireEmail" class="form-group" ng-class="{ 'has-error': ownerForm.email.$dirty && ownerForm.email.$invalid }">
-                  <label class="control-label">Email <sup><a ng-href="{{ webServerOrigin }}/documentation/installation/#admin-account" class="help" target="_blank" tabIndex="-1"><i class="fa fa-question-circle"></i></a></sup></label>
-                  <input type="email" class="form-control" ng-model="account.email" id="inputEmail" name="email" placeholder="Email" required autocomplete="off" tooltip-class="long" tooltip-trigger="focus" uib-tooltip="This email address is local to your Cloudron and used for notifications and password reset. A valid email is also required for Let's Encrypt certificates.">
+                <div class="form-group" ng-class="{ 'has-error': ownerForm.email.$dirty && ownerForm.email.$invalid }">
+                  <label class="control-label" for="inputEmail">Email <sup><a ng-href="{{ webServerOrigin }}/documentation/installation/#admin-account" class="help" target="_blank" tabIndex="-1"><i class="fa fa-question-circle"></i></a></sup></label>
+                  <input type="email" class="form-control" ng-model="owner.email" id="inputEmail" name="email" placeholder="Email" required autocomplete="off" ng-disabled="owner.busy">
+                  <small>Email is local to your Cloudron. A valid email is required for Let's Encrypt certificates.</small>
                 </div>
-                <div class="form-group" ng-class="{ 'has-error': (ownerForm.username.$dirty && ownerForm.username.$invalid) || (!ownerForm.username.$dirty && error.username) }">
-                  <label class="control-label">Username</label>
-                  <p ng-show="!ownerForm.username.$dirty && error.username">{{ error.username }}</p>
-                  <input type="text" class="form-control" ng-model="account.username" id="inputUsername" name="username" placeholder="Username" ng-maxlength="512" ng-minlength="1" required autocomplete="off">
+                <div class="form-group" ng-class="{ 'has-error': (ownerForm.username.$dirty && ownerForm.username.$invalid) || (!ownerForm.username.$dirty && owner.error.username) }">
+                  <label class="control-label" for="inputUsername">Username</label>
+                  <p ng-show="!ownerForm.username.$dirty && owner.error.username">{{ owner.error.username }}</p>
+                  <input type="text" class="form-control" ng-model="owner.username" id="inputUsername" name="username" placeholder="Username" ng-maxlength="512" ng-minlength="1" required autocomplete="off" ng-disabled="owner.busy">
                 </div>
                 <div class="form-group" ng-class="{ 'has-error': ownerForm.password.$dirty && ownerForm.password.$invalid }">
-                  <label class="control-label">Password</label>
-                  <input type="password" class="form-control" ng-model="account.password" id="inputPassword" name="password" placeholder="Password" ng-pattern="/^.{8,}$/" required autocomplete="off">
+                  <label class="control-label" for="inputPassword">Password</label>
+                  <input type="password" class="form-control" ng-model="owner.password" id="inputPassword" name="password" placeholder="Password" ng-pattern="/^.{8,}$/" required autocomplete="off" ng-disabled="owner.busy">
                   <div class="control-label" ng-show="ownerForm.password.$dirty && ownerForm.password.$invalid">
                     <small ng-show="ownerForm.password.$dirty && ownerForm.password.$invalid">Password must be atleast 8 characters</small>
                   </div>
@@ -90,7 +84,7 @@
             <br/>
             <div class="row">
               <div class="col-md-12 text-center">
-                <input type="submit" class="btn btn-success" ng-disabled="setupForm.$invalid" value="Done">
+                <button type="submit" class="btn btn-success" ng-disabled="ownerForm.$invalid || owner.busy"><i class="fa fa-circle-notch fa-spin" ng-show="owner.busy"></i> Create Admin</button>
               </div>
             </div>
           </form>
@@ -98,52 +92,41 @@
       </div>
     </div>
 
-    <div class="row" ng-show="!busy && view === 'email'">
+    <div class="row" ng-show="view === 'finished'">
       <div class="col-md-6 col-md-offset-3">
-        <div class="card" style="max-width: none; padding: 20px;">
-          <form role="form" name="emailForm" ng-submit="email.submit()" novalidate>
-            <div class="row">
-              <div class="col-md-12 text-center">
-                <h1>Welcome to Cloudron</h1>
-                <h3>Setup Email Sending</h3>
-              </div>
+        <div class="card" style="max-width: none; padding: 20px 40px;">
+          <div class="row">
+            <div class="col-md-12 text-center">
+              <h1>Before you install the first app</h1>
             </div>
-            <br/>
-            <br/>
-
-            <br/>
-            <br/>
-            <div class="row">
-              <div class="col-md-12 text-center">
-                <input type="submit" class="btn btn-success" ng-disabled="emailForm.$invalid" value="Done">
-              </div>
+          </div>
+          <br/>
+          <br/>
+          <p>
+            A few notes about apps on your Cloudron:
+            <ul style="list-style-type: none;">
+              <li>
+                Apps are pre-setup to work out-of-the box.
+                This also includes for example email sending configurations.
+                <br/>
+                <i class="fa fa-caret-right"></i> The dashboard will help you to ensure emails can be delivered.
+              </li>
+              <br/>
+              <li>
+                Cloudron has a built-in user directory and most apps are configured to use that by default.
+                <br/>
+                <i class="fa fa-caret-right"></i> User integration and access can be configured per app.
+              </li>
+            </ul>
+          </p>
+          <br/>
+          <br/>
+          <br/>
+          <div class="row">
+            <div class="col-md-12 text-center">
+              <a class="btn btn-success" href="/">Proceed to Dashboard</a>
             </div>
-          </form>
-        </div>
-      </div>
-    </div>
-
-    <div class="row" ng-show="!busy && view === 'invite'">
-      <div class="col-md-6 col-md-offset-3">
-        <div class="card" style="max-width: none; padding: 20px;">
-          <form role="form" name="inviteForm" ng-submit="invite.submit()" novalidate>
-            <div class="row">
-              <div class="col-md-12 text-center">
-                <h1>Welcome to Cloudron</h1>
-                <h3>Invite your first Users</h3>
-              </div>
-            </div>
-            <br/>
-            <br/>
-
-            <br/>
-            <br/>
-            <div class="row">
-              <div class="col-md-12 text-center">
-                <input type="submit" class="btn btn-success" ng-disabled="inviteForm.$invalid" value="Done">
-              </div>
-            </div>
-          </form>
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/setupdns.html b/src/setupdns.html
index c305f8da0..cd6f8433a 100644
--- a/src/setupdns.html
+++ b/src/setupdns.html
@@ -58,19 +58,22 @@
                 <div class="card" style="max-width: none; padding: 20px;">
                     <form name="dnsCredentialsForm" role="form" novalidate ng-submit="setDnsCredentials()" autocomplete="off">
                         <div class="row">
-                            <div class="col-md-10 col-md-offset-1 text-center">
-                                <h1>Domain Setup</h1>
-                                <p class="has-error text-center" ng-show="error.setup">{{ error.setup }}</p>
-                            </div>
+                          <div class="col-md-10 col-md-offset-1 text-center">
+                            <h1>Domain Setup</h1>
+                            <p class="has-error text-center" ng-show="error.setup">{{ error.setup }}</p>
+                          </div>
                         </div>
                         <div class="row">
-                            <div class="col-md-10 col-md-offset-1">
-                                <div class="form-group" style="margin-bottom: 0;" ng-class="{ 'has-error': dnsCredentialsForm.domain.$dirty && dnsCredentialsForm.domain.$invalid }">
-                                    <label class="control-label">Domain  <sup><a ng-href="{{ webServerOrigin }}/documentation/installation/#domain-setup" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-                                    <input type="text" class="form-control" ng-model="dnsCredentials.domain" name="domain" placeholder="example.com" required autofocus ng-disabled="dnsCredentials.busy">
-                                </div>
-                                <p style="margin-top: 5px; font-size: 13px;">Apps will be installed on subdomains of this domain. You can add more domains later.</p>
+                          <div class="col-md-10 col-md-offset-1">
+                            <div class="form-group" style="margin-bottom: 0;" ng-class="{ 'has-error': dnsCredentialsForm.domain.$dirty && dnsCredentialsForm.domain.$invalid }">
+                              <label class="control-label">Domain  <sup><a ng-href="{{ webServerOrigin }}/documentation/installation/#domain-setup" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+                              <input type="text" class="form-control" ng-model="dnsCredentials.domain" name="domain" placeholder="example.com" required autofocus ng-disabled="dnsCredentials.busy">
+                              <p style="margin-top: 5px; font-size: 13px;">
+                                Apps will be installed on subdomains of this domain, the dashboard at the <b>my.</b> subdomain.<br/>
+                                You can add more domains later.
+                              </p>
                             </div>
+                          </div>
                         </div>
                         <div class="row">
                             <div class="col-md-10 col-md-offset-1">