diff --git a/src/setup.html b/src/setup.html
index cef7cc0a9..8eadfd65f 100644
--- a/src/setup.html
+++ b/src/setup.html
@@ -64,7 +64,7 @@
                 <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>
+                  <small>A valid email is required for Let's Encrypt certificates. This email is local to your Cloudron. </small>
                 </div>
                 <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>
@@ -97,31 +97,26 @@
         <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>
+              <h1>Cloudron is ready to use</h1>
             </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.
+            &nbsp; &nbsp; Before you start:
+            <ul class="fa-ul">
+              <li><i class="fa-li fa fa-users"></i>
+                <b>User management</b>: Cloudron has a central user directory. When installing an app,
+                you can choose whether to set it up with Cloudron Directory integration.
               </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><i class="fa-li fa fa-envelope-open"></i>
+                <b>Email Configuration</b>: All apps are configured to send email via the built-in
+                mail server. Instead of configuring each app, you can configure and track mail delivery in
+                the Email view.
               </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>
diff --git a/src/setupdns.html b/src/setupdns.html
index b1ab5a200..fd6ea3160 100644
--- a/src/setupdns.html
+++ b/src/setupdns.html
@@ -46,17 +46,16 @@
 
   <div class="main-container ng-cloak text-center" ng-show="state === 'waitingForDnsSetup' || state === 'waitingForBox'">
     <div class="row">
-      <div class="col-md-4 col-md-offset-4">
+      <div class="col-md-6 col-md-offset-3 text-center">
         <i class="fa fa-circle-notch fa-spin fa-5x"></i><br/>
         <h3>{{ message }} ...</h3>
         <br/>
         <br/>
+        <br/>
+        <br/>
         <p>
-          Cloudron is setting up the domain, waits for DNS propagation and obtains a SSL certificate.
-          Depending on your DNS provider, this may take up to 30 minutes.
-          <br/>
-          <br/>
-          You can follow the logs on your server at <code class="clipboard hand" data-clipboard-text="/home/yellowtent/platformdata/logs/box.log" uib-tooltip="{{ clipboardDone ? 'Copied' : 'Click to copy' }}" tooltip-placement="right">/home/yellowtent/platformdata/logs/box.log</code>
+          Please wait while Cloudron is setting up the dashboard at my.{{dnsCredentials.domain}}.
+          You can follow the logs on the server at <code class="clipboard hand" data-clipboard-text="/home/yellowtent/platformdata/logs/box.log" uib-tooltip="{{ clipboardDone ? 'Copied' : 'Click to copy' }}" tooltip-placement="right">/home/yellowtent/platformdata/logs/box.log</code>
         </p>
       </div>
     </div>
@@ -79,7 +78,7 @@
                               <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. You can add more domains later.
+                                Apps will be installed on subdomains of this domain. The dashboard will be available on the <b>my</b> subdomain. You can add more domains later.
                               </p>
                             </div>
                           </div>