diff --git a/webadmin/src/js/setup.js b/webadmin/src/js/setup.js
index 652c6ecd6..c85865e62 100644
--- a/webadmin/src/js/setup.js
+++ b/webadmin/src/js/setup.js
@@ -222,6 +222,7 @@ app.controller('StepController', ['$scope', '$route', '$location', 'Wizard', fun
 
 app.controller('FinishController', ['$scope', '$location', 'Wizard', 'Client', function ($scope, $location, Wizard, Client) {
     $scope.wizard = Wizard;
+    $scope.setupToken = null;
 
     Client.createAdmin($scope.wizard.username, $scope.wizard.password, $scope.wizard.email, $scope.setupToken, function (error) {
         if (error) {
@@ -281,6 +282,9 @@ app.controller('SetupController', ['$scope', '$location', 'Client', 'Wizard', fu
 
             $scope.setupToken = search.setupToken;
             Wizard.email = search.email;
+
+            // angular ng-attr is only false when 'undefined'
+            Wizard.requireEmail = search.email || undefined;
         }
 
         $location.path('/step1');
diff --git a/webadmin/src/views/setup/step2.html b/webadmin/src/views/setup/step2.html
index 9a4f8bf80..3493a1339 100644
--- a/webadmin/src/views/setup/step2.html
+++ b/webadmin/src/views/setup/step2.html
@@ -10,6 +10,10 @@
 <br/>
 <div class="row">
     <div class="col-md-4 col-md-offset-4 text-center">
+        <div ng-hide="wizard.emailPreset" class="form-group" ng-class="{ 'has-error': setup_form.email.$dirty && setup_form.email.$invalid }">
+            <!-- <label class="control-label" for="inputUsername">Username</label> -->
+            <input type="email" class="form-control" ng-model="wizard.email" id="inputEmail" name="email" placeholder="Email" ng-enter="focusNext('inputUsername', setup_form.email.$invalid)" ng-attr-autofocus="{{wizard.requireEmail}}" required autocomplete="off">
+        </div>
         <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">