diff --git a/webadmin/src/js/setup.js b/webadmin/src/js/setup.js
index e8c337220..511eb35db 100644
--- a/webadmin/src/js/setup.js
+++ b/webadmin/src/js/setup.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // create main application module
-var app = angular.module('Application', ['angular-md5', 'ui-notification']);
+var app = angular.module('Application', ['angular-md5', 'ui-notification', 'ui.bootstrap']);
 
 app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope, $http, Client) {
     // Stupid angular location provider either wants html5 location mode or not, do the query parsing on my own
diff --git a/webadmin/src/setup.html b/webadmin/src/setup.html
index 27714a961..822e3b422 100644
--- a/webadmin/src/setup.html
+++ b/webadmin/src/setup.html
@@ -26,6 +26,9 @@
     <script src="3rdparty/js/angular-ui-notification.min.js"></script>
     <script src="3rdparty/js/autofill-event.js"></script>
 
+    <!-- Angular directives for bootstrap https://angular-ui.github.io/bootstrap/ -->
+    <script src="3rdparty/js/ui-bootstrap-tpls-1.3.3.min.js"></script>
+
     <!-- Setup Application -->
     <script src="js/setup.js"></script>
 
@@ -67,7 +70,7 @@
                                     <input type="text" class="form-control" ng-model="account.displayName" id="inputDisplayName" name="displayName" placeholder="Display Name" required autocomplete="off" autofocus>
                                 </div>
                                 <div ng-show="account.requireEmail" class="form-group" ng-class="{ 'has-error': setupForm.email.$dirty && setupForm.email.$invalid }">
-                                    <input type="email" class="form-control" ng-model="account.email" id="inputEmail" name="email" placeholder="Email" required autocomplete="off">
+                                    <input type="email" class="form-control" ng-model="account.email" id="inputEmail" name="email" placeholder="Email" required autocomplete="off" tooltip-trigger="focus" uib-tooltip="This email address is local to your Cloudron and used for notifications and password reset.">
                                 </div>
                                 <div class="form-group" ng-class="{ 'has-error': setupForm.username.$dirty && setupForm.username.$invalid }">
                                     <input type="text" class="form-control" ng-model="account.username" id="inputUsername" name="username" placeholder="Username" ng-maxlength="512" ng-minlength="3" required autocomplete="off">