diff --git a/src/js/setupaccount.js b/src/js/setupaccount.js
index 23a7f3bb9..b3d7954e5 100644
--- a/src/js/setupaccount.js
+++ b/src/js/setupaccount.js
@@ -12,16 +12,18 @@ app.controller('SetupAccountController', ['$scope', '$http', function ($scope, $
     var API_ORIGIN = '<%= oauth.apiOrigin %>' || window.location.origin;
 
     $scope.busy = false;
-    $scope.error = false;
+    $scope.error = null;
+    $scope.view = 'setup';
 
     $scope.existingUsername = !!search.username;
     $scope.username = search.username || '';
-    $scope.displayName = '';
+    $scope.displayName = search.displayName || '';
     $scope.password = '';
     $scope.passwordRepeat = '';
 
     $scope.onSubmit = function () {
         $scope.busy = true;
+        $scope.error = null;
 
         var data = {
             resetToken: search.resetToken,
@@ -31,24 +33,40 @@ app.controller('SetupAccountController', ['$scope', '$http', function ($scope, $
             password: $scope.password
         };
 
-        function error(status) {
-            console.log('error', status)
+        function error(data, status) {
             $scope.busy = false;
 
-            if (status === 401) $scope.error = 'Invalid reset token';
-            else if (status === 409) $scope.error = 'Ask your admin for an invite link first';
-            else $scope.error = 'Unknown error';
+            if (status === 401) {
+                $scope.view = 'invalidToken';
+            } else if (status === 409) {
+                $scope.error = {
+                    username: true,
+                    message: 'Username already taken'
+                };
+                $scope.setupAccountForm.username.$setPristine();
+                setTimeout(function () { $('#inputUsername').focus(); }, 200);
+            } else if (status === 400) {
+                $scope.error = {
+                    message: data.message
+                };
+                if (data.message.indexOf('Username') === 0) {
+                    $scope.setupAccountForm.username.$setPristine();
+                    $scope.error.username = true;
+                }
+            } else {
+                $scope.error = { message: 'Unknown error. Please try again later.' };
+                console.error(status, data);
+            }
         }
 
-        $http.post(API_ORIGIN + '/api/v1/cloudron/password_reset', data).success(function (data, status) {
-            if (status !== 202) return error(status);
+        $http.post(API_ORIGIN + '/api/v1/cloudron/setup_account', data).success(function (data, status) {
+            if (status !== 201) return error(data, status);
 
             // set token to autologin
             localStorage.token = data.accessToken;
 
-            $scope.mode = 'newPasswordDone';
-        }).error(function (data, status) {
-            error(status);
-        });
+            $scope.view = 'done';
+        }).error(error);
     };
+
 }]);
diff --git a/src/setupaccount.html b/src/setupaccount.html
index c0615ddba..d224b0cef 100644
--- a/src/setupaccount.html
+++ b/src/setupaccount.html
@@ -40,69 +40,98 @@
 
 <div class="layout-root">
 
-  <div class="layout-content">
+  <div class="layout-content" ng-show="view === 'setup'">
     <div class="card" style="padding: 20px; margin-top: 100px; max-width: 620px;">
       <div class="row">
         <div class="col-md-12" style="text-align: center;">
           <img width="128" height="128" style="margin-top: -84px" src="<%= apiOrigin %>/api/v1/cloudron/avatar"/>
           <br/>
-          <h2>Cloudron Account Setup</h2>
+          <h2>Welcome</h2>
+          <h3>Before you start, setup your account.</h3>
         </div>
       </div>
       <br/>
       <div class="row">
         <div class="col-md-12">
-          <h4 class="has-error" ng-show="error">Invalid Credentials</h4>
+          <h4 class="has-error" ng-show="error">{{ error.message }}</h4>
         </div>
       </div>
       <div class="row">
         <div class="col-md-12">
-          <form name="setupAccountForm" ng-submit="onSubmit()">
-          <input type="password" style="display: none;">
+          <form name="setupAccountForm" ng-submit="onSubmit()" autocomplete="off">
+            <input type="password" style="display: none;">
 
-          <div class="form-group" ng-show="existingUsername">
-            <label class="control-label">Username</label>
-            <input type="text" class="form-control" ng-model="username" name="username" readonly required>
-          </div>
-          <div class="form-group" ng-class="{ 'has-error': (setupAccountForm.username.$dirty && setupAccountForm.username.$invalid) }" ng-hide="existingUsername">
-            <label class="control-label">Username</label>
-            <div class="control-label" ng-show="setupAccountForm.username.$dirty && setupAccountForm.username.$invalid">
-            <small ng-show="setupAccountForm.username.$error.minlength">The username is too short</small>
-            <small ng-show="setupAccountForm.username.$error.maxlength">The username is too long</small>
-            <small ng-show="setupAccountForm.username.$dirty && setupAccountForm.username.$invalid">Not a valid username</small>
+            <div class="form-group" ng-show="existingUsername">
+              <label class="control-label">Username</label>
+              <input type="text" class="form-control" ng-model="username" name="username" readonly required>
             </div>
-            <input type="text" class="form-control" ng-model="username" name="username" required autofocus>
-          </div>
-
-          <div class="form-group">
-            <label class="control-label">Full Name</label>
-            <input type="displayName" class="form-control" ng-model="displayName" name="displayName" required>
-          </div>
-
-          <div class="form-group" ng-class="{ 'has-error': (setupAccountForm.password.$dirty && setupAccountForm.password.$invalid) }">
-            <label class="control-label">New Password</label>
-            <div class="control-label" ng-show="setupAccountForm.password.$dirty && setupAccountForm.password.$invalid">
-              <small ng-show="setupAccountForm.password.$dirty && setupAccountForm.password.$invalid">Password must be atleast 8 characters</small>
+            <div class="form-group" ng-class="{ 'has-error': ((setupAccountForm.username.$dirty && setupAccountForm.username.$invalid) || (!setupAccountForm.username.$dirty && error.username))}" ng-hide="existingUsername">
+              <label class="control-label">Username</label>
+              <div class="control-label" ng-show="setupAccountForm.username.$dirty && setupAccountForm.username.$invalid">
+              <small ng-show="setupAccountForm.username.$error.minlength">The username is too short</small>
+              <small ng-show="setupAccountForm.username.$error.maxlength">The username is too long</small>
+              <small ng-show="setupAccountForm.username.$dirty && setupAccountForm.username.$invalid">Not a valid username</small>
+              </div>
+              <input type="text" class="form-control" ng-model="username" name="username" id="inputUsername" required autofocus>
             </div>
-            <input type="password" class="form-control" ng-model="password" name="password" ng-pattern="/^.{8,}$/" required>
-          </div>
 
-          <div class="form-group" ng-class="{ 'has-error': (setupAccountForm.passwordRepeat.$dirty && (password !== passwordRepeat)) }">
-            <label class="control-label">Repeat Password</label>
-            <div class="control-label" ng-show="setupAccountForm.passwordRepeat.$dirty && (password !== passwordRepeat)">
-              <small ng-show="setupAccountForm.passwordRepeat.$dirty && (password !== passwordRepeat)">Passwords don't match</small>
+            <div class="form-group">
+              <label class="control-label">Full Name</label>
+              <input type="displayName" class="form-control" ng-model="displayName" name="displayName" required>
             </div>
-            <input type="password" class="form-control" ng-model="passwordRepeat" name="passwordRepeat" required>
-          </div>
 
-          <button class="btn btn-primary btn-outline pull-right" type="submit" ng-disabled="busy || setupAccountForm.$invalid || password !== passwordRepeat"><i class="fa fa-circle-notch fa-spin" ng-show="busy"></i> Setup</button>
-        </form>
+            <div class="form-group" ng-class="{ 'has-error': (setupAccountForm.password.$dirty && setupAccountForm.password.$invalid) }">
+              <label class="control-label">New Password</label>
+              <div class="control-label" ng-show="setupAccountForm.password.$dirty && setupAccountForm.password.$invalid">
+                <small ng-show="setupAccountForm.password.$dirty && setupAccountForm.password.$invalid">Password must be atleast 8 characters</small>
+              </div>
+              <input type="password" class="form-control" ng-model="password" name="password" ng-pattern="/^.{8,}$/" required>
+            </div>
+
+            <div class="form-group" ng-class="{ 'has-error': (setupAccountForm.passwordRepeat.$dirty && (password !== passwordRepeat)) }">
+              <label class="control-label">Repeat Password</label>
+              <div class="control-label" ng-show="setupAccountForm.passwordRepeat.$dirty && (password !== passwordRepeat)">
+                <small ng-show="setupAccountForm.passwordRepeat.$dirty && (password !== passwordRepeat)">Passwords don't match</small>
+              </div>
+              <input type="password" class="form-control" ng-model="passwordRepeat" name="passwordRepeat" required>
+            </div>
+
+            <button class="btn btn-primary btn-outline pull-right" type="submit" ng-disabled="busy || setupAccountForm.$invalid || password !== passwordRepeat"><i class="fa fa-circle-notch fa-spin" ng-show="busy"></i> Setup</button>
+          </form>
+        </div>
       </div>
     </div>
   </div>
+
+  <div class="layout-content" ng-show="view === 'invalidToken'">
+    <div class="card" style="padding: 20px; margin-top: 100px; max-width: 620px;">
+      <div class="row">
+        <div class="col-md-12" style="text-align: center;">
+          <img width="128" height="128" style="margin-top: -84px" src="<%= apiOrigin %>/api/v1/cloudron/avatar"/>
+          <br/>
+          <h2>Invalid or Expired Invite Link</h2>
+          <br/>
+          <p>Contact your server admin to get a new invite link.</p>
+        </div>
+      </div>
+    </div>
   </div>
 
-<footer class="text-center">
+  <div class="layout-content" ng-show="view === 'done'">
+    <div class="card" style="padding: 20px; margin-top: 100px; max-width: 620px;">
+      <div class="row">
+        <div class="col-md-12" style="text-align: center;">
+          <img width="128" height="128" style="margin-top: -84px" src="<%= apiOrigin %>/api/v1/cloudron/avatar"/>
+          <br/>
+          <h2>Your Account is ready</h2>
+          <br/>
+          <a href="/" class="btn btn-primary">Open Dashboard</a>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <footer class="text-center">
     <span class="text-muted">&copy; 2016-20 <a href="https://cloudron.io" target="_blank">Cloudron</a></span>
   </footer>