diff --git a/source/assets/stylesheets/application.css.sass b/source/assets/stylesheets/application.css.sass
index 824b53a..31b34e2 100755
--- a/source/assets/stylesheets/application.css.sass
+++ b/source/assets/stylesheets/application.css.sass
@@ -15,9 +15,6 @@ body.login
     border: 1px solid rgba(black, .3)
     margin: 10% auto
     width: 300px
-    h4
-      margin: 0 0 15px 0
-      text-align: center
     .brand
       margin-top: -15px
       h1
@@ -37,6 +34,8 @@ body.login
     .text-center
       .checkbox
         text-align: center
+      legend
+        text-align: center
         input
           float: none
 
diff --git a/source/forgot_password.html.haml b/source/forgot_password.html.haml
index f80e507..244b63f 100755
--- a/source/forgot_password.html.haml
+++ b/source/forgot_password.html.haml
@@ -2,8 +2,9 @@
 
 .row
   .col-lg-12
-    %h4=t(:forgot_password_heading)
     %form
+      %fieldset
+        %legend=t(:forgot_password_heading)
       .form-group
         %label.control-label=t(:login_email)
         %input.form-control{placeholder: t(:login_email_hint), type: 'text'}/
diff --git a/source/index.html.haml b/source/index.html.haml
index 87b8bdb..c623bde 100755
--- a/source/index.html.haml
+++ b/source/index.html.haml
@@ -9,17 +9,18 @@
         Hierapolis
 .row
   .col-lg-12
-    %h4=t(:login_heading)
     %form
-      .form-group
-        %input.form-control{placeholder: t(:login_email), type: 'text'}/
-      .form-group
-        %input.form-control{placeholder: t(:login_password), type: 'password'}/
-      .text-center
-        .checkbox
-          %label
-            %input{:type => 'checkbox'}/
-            =t(:login_remember_me)
-        =link_to t(:sign_in), 'dashboard.html', class: 'btn btn-default'
-        %br/
-        =link_to t(:forgot_password), 'forgot_password.html'
+      %fieldset.text-center
+        %legend=t(:login_heading)
+        .form-group
+          %input.form-control{placeholder: t(:login_email), type: 'text'}/
+        .form-group
+          %input.form-control{placeholder: t(:login_password), type: 'password'}/
+        .text-center
+          .checkbox
+            %label
+              %input{:type => 'checkbox'}/
+              =t(:login_remember_me)
+          =link_to t(:sign_in), 'dashboard.html', class: 'btn btn-default'
+          %br/
+          =link_to t(:forgot_password), 'forgot_password.html'