diff --git a/lms/static/sass/views/_login-register.scss b/lms/static/sass/views/_login-register.scss
index fd11e73b5a..c73938e9c4 100644
--- a/lms/static/sass/views/_login-register.scss
+++ b/lms/static/sass/views/_login-register.scss
@@ -120,6 +120,7 @@
     .form-label {
         @extend %bold-label;
         padding: 0 0 0 5px;
+        letter-spacing: 1px;
     }
 
     .action-label {
diff --git a/lms/templates/student_account/access.underscore b/lms/templates/student_account/access.underscore
index 5eb739fd67..664bd308d8 100644
--- a/lms/templates/student_account/access.underscore
+++ b/lms/templates/student_account/access.underscore
@@ -5,28 +5,28 @@
 
 <% if ( mode === 'login' ) { %>
     <section id="register-anchor" class="form-type">
-        <h2>
+        <span>
             <input type="radio" name="form" id="register-option" value="register" class="form-toggle" <% if ( mode === 'register' ) { %>checked<% } %> >
             <label for="register-option" class="form-label"><%- gettext("I am a new user") %></label>
-        </h2>
+        </span>
         <div id="register-form" class="form-wrapper <% if ( mode !== 'register' ) { %>hidden" aria-hidden="true<% } %>"></div>
     </section>
 <% } %>
 
 <section id="login-anchor" class="form-type">
-    <h2>
+    <span>
         <input type="radio" name="form" id="login-option" value="login" class="form-toggle" <% if ( mode === 'login' ) { %>checked<% } %>>
         <label for="login-option" class="form-label"><%- gettext("I am a returning user") %></label>
-    </h2>
+    </span>
     <div id="login-form" class="form-wrapper <% if ( mode !== 'login' ) { %>hidden" aria-hidden="true<% } %>"></div>
 </section>
 
 <% if ( mode === 'register' ) { %>
     <section id="register-anchor" class="form-type">
-        <h2>
+        <span>
             <input type="radio" name="form" id="register-option" value="register" class="form-toggle" <% if ( mode === 'register' ) { %>checked<% } %> >
             <label for="register-option" class="form-label"><%- gettext("I am a new user") %></label>
-        </h2>
+        </span>
         <div id="register-form" class="form-wrapper <% if ( mode !== 'register' ) { %>hidden" aria-hidden="true<% } %>"></div>
     </section>
 <% } %>
diff --git a/lms/templates/student_account/login.underscore b/lms/templates/student_account/login.underscore
index ddfc9ce7d9..b01e4432d0 100644
--- a/lms/templates/student_account/login.underscore
+++ b/lms/templates/student_account/login.underscore
@@ -19,8 +19,9 @@
 
 <% _.each( context.providers, function( provider ) {
     if ( provider.loginUrl ) { %>
-        <button type="submit"class="button button-primary button-<%- provider.name %> login-provider" data-provider-url="<%- provider.loginUrl %>">
-            <span class="icon <%- provider.iconClass %>"></span><%- _.sprintf(gettext("Log in using %(name)s"), provider) %>
+        <button type="submit" class="button button-primary button-<%- provider.name %> login-provider" data-provider-url="<%- provider.loginUrl %>">
+            <span class="icon <%- provider.iconClass %>" aria-hidden="true"></span>
+            <%- _.sprintf(gettext("Log in using %(name)s"), provider) %>
         </button>
     <% }
 }); %>
diff --git a/lms/templates/student_account/register.underscore b/lms/templates/student_account/register.underscore
index 7bb2050dd3..d588940666 100644
--- a/lms/templates/student_account/register.underscore
+++ b/lms/templates/student_account/register.underscore
@@ -8,8 +8,9 @@
 <% } else {
     _.each( context.providers, function( provider) {
         if ( provider.registerUrl ) { %>
-            <button type="submit"class="button button-primary button-<%- provider.name %> login-provider" data-provider-url="<%- provider.registerUrl %>">
-                <span class="icon <%- provider.iconClass %>"></span><%- _.sprintf(gettext("Register using %(name)s"), provider) %>
+            <button type="submit" class="button button-primary button-<%- provider.name %> login-provider" data-provider-url="<%- provider.registerUrl %>">
+                <span class="icon <%- provider.iconClass %>" aria-hidden="true"></span>
+                <%- _.sprintf(gettext("Register using %(name)s"), provider) %>
             </button>
     <%  }
     });