diff --git a/app/components/ch-form/password-field.hbs b/app/components/ch-form/password-field.hbs
index 1b83a1f1..7bc844e1 100644
--- a/app/components/ch-form/password-field.hbs
+++ b/app/components/ch-form/password-field.hbs
@@ -21,9 +21,9 @@
       >
       <a href {{action this.toggleShow}} class="input-group-text border-start-0 bg-white">
         {{#if this.showPassword}}
-          {{fa-icon "eye" fixed=true}}
+          {{fa-icon "eye" fixed=true title="Hide Password"}}
         {{else}}
-          {{fa-icon "eye-slash" fixed=true}}
+          {{fa-icon "eye-slash" fixed=true title="Show Password"}}
         {{/if}}
       </a>
     </div>
diff --git a/app/templates/login.hbs b/app/templates/login.hbs
index 186122f4..a789c00e 100644
--- a/app/templates/login.hbs
+++ b/app/templates/login.hbs
@@ -90,13 +90,16 @@
                   @autocomplete="username"
                   @autofocus={{true}}
                   @noSpaces={{true}}
-                  @size={{30}}/>
+                  @size={{30}}
+                  @wrapClass="col-12"
+          />
         </FormRow>
         <FormRow>
           <f.password @name="password"
                       @label="Password"
                       @autocomplete="current-password"
-                      @size={{30}}/>
+                      @size={{30}}
+          />
         </FormRow>
         <FormRow>
           <div class="col-sm-12 col-lg-4">