diff --git a/src/js/setup.js b/src/js/setup.js
index ec544eafd..03c391c59 100644
--- a/src/js/setup.js
+++ b/src/js/setup.js
@@ -39,10 +39,18 @@ app.controller('SetupController', ['$scope', 'Client', function ($scope, Client)
             Client.createAdmin(data, 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);
+
+                    if (error.message === 'Invalid email') {
+                        $scope.owner.error = { email: error.message };
+                        $scope.owner.email = '';
+                        $scope.ownerForm.email.$setPristine();
+                        setTimeout(function () { $('#inputEmail').focus(); }, 200);
+                    } else {
+                        $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;
diff --git a/src/setup.html b/src/setup.html
index 50fc4fcd5..27f769440 100644
--- a/src/setup.html
+++ b/src/setup.html
@@ -72,7 +72,7 @@
                   <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 class="form-group" ng-class="{ 'has-error': ownerForm.email.$dirty && ownerForm.email.$invalid }">
+                <div class="form-group" ng-class="{ 'has-error': (ownerForm.email.$dirty && ownerForm.email.$invalid) || (!ownerForm.email.$dirty && owner.error.email) }">
                   <label class="control-label" for="inputEmail">Email <sup><a ng-href="https://docs.cloudron.io/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>A valid email is required for Let's Encrypt certificates. This email is local to your Cloudron. </small>