diff --git a/src/setup.html b/src/setup.html
index 8eadfd65f..83d9a0291 100644
--- a/src/setup.html
+++ b/src/setup.html
@@ -68,15 +68,13 @@
                 </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>
-                  <p ng-show="!ownerForm.username.$dirty && owner.error.username">{{ owner.error.username }}</p>
                   <input type="text" class="form-control" ng-model="owner.username" id="inputUsername" name="username" placeholder="Username" ng-maxlength="512" ng-minlength="1" required autocomplete="off" ng-disabled="owner.busy">
+                  <small>{{ owner.error.username }}</small>
                 </div>
-                <div class="form-group" ng-class="{ 'has-error': ownerForm.password.$dirty && ownerForm.password.$invalid }">
+                <div class="form-group" style="margin-bottom: 0;" ng-class="{ 'has-error': ownerForm.password.$dirty && ownerForm.password.$invalid }">
                   <label class="control-label" for="inputPassword">Password</label>
                   <input type="password" class="form-control" ng-model="owner.password" id="inputPassword" name="password" placeholder="Password" ng-pattern="/^.{8,}$/" required autocomplete="off" ng-disabled="owner.busy">
-                  <div class="control-label" ng-show="ownerForm.password.$dirty && ownerForm.password.$invalid">
-                    <small ng-show="ownerForm.password.$dirty && ownerForm.password.$invalid">Password must be atleast 8 characters</small>
-                  </div>
+                  <small><span ng-show="ownerForm.password.$dirty && ownerForm.password.$invalid">Password must be atleast 8 characters</span> &nbsp;</small>
                 </div>
               </div>
             </div>