diff --git a/lms/templates/login.html b/lms/templates/login.html
index ab817c2b5f..84e48505e1 100644
--- a/lms/templates/login.html
+++ b/lms/templates/login.html
@@ -199,7 +199,7 @@
 % endif
 
       <div class="form-actions">
-        <button name="submit" type="submit" id="submit" class="action action-primary action-update"></button>
+        <button name="submit" type="submit" id="submit" class="action action-primary action-update login-button"></button>
       </div>
     </form>
 
@@ -215,7 +215,7 @@
 
     % for enabled in provider.Registry.enabled():
       ## Translators: provider_name is the name of an external, third-party user authentication provider (like Google or LinkedIn).
-      <button type="submit" class="button button-primary button-${enabled.NAME}" onclick="thirdPartySignin(event, '${pipeline_url[enabled.NAME]}');"><span class="icon ${enabled.ICON_CLASS}"></span>${_('Sign in with {provider_name}').format(provider_name=enabled.NAME)}</button>
+      <button type="submit" class="button button-primary button-${enabled.NAME} login-${enabled.NAME}" onclick="thirdPartySignin(event, '${pipeline_url[enabled.NAME]}');"><span class="icon ${enabled.ICON_CLASS}"></span>${_('Sign in with {provider_name}').format(provider_name=enabled.NAME)}</button>
     % endfor
 
     </div>
diff --git a/lms/templates/register.html b/lms/templates/register.html
index 8cf3ba8f1f..9942f807c1 100644
--- a/lms/templates/register.html
+++ b/lms/templates/register.html
@@ -125,7 +125,7 @@
 
         % for enabled in provider.Registry.enabled():
           ## Translators: provider_name is the name of an external, third-party user authentication service (like Google or LinkedIn).
-          <button type="submit" class="button button-primary button-${enabled.NAME}" onclick="thirdPartySignin(event, '${pipeline_urls[enabled.NAME]}');"><span class="icon ${enabled.ICON_CLASS}"></span>${_('Sign up with {provider_name}').format(provider_name=enabled.NAME)}</button>
+          <button type="submit" class="button button-primary button-${enabled.NAME} register-${enabled.NAME}" onclick="thirdPartySignin(event, '${pipeline_urls[enabled.NAME]}');"><span class="icon ${enabled.ICON_CLASS}"></span>${_('Sign up with {provider_name}').format(provider_name=enabled.NAME)}</button>
         % endfor
 
         </div>
@@ -362,7 +362,7 @@
 % endif
 
       <div class="form-actions">
-        <button name="submit" type="submit" id="submit" class="action action-primary action-update">${_('Register')} <span class="orn-plus">+</span> ${_('Create My Account')}</button>
+        <button name="submit" type="submit" id="submit" class="action action-primary action-update register-button">${_('Register')} <span class="orn-plus">+</span> ${_('Create My Account')}</button>
       </div>
     </form>
   </section>
diff --git a/lms/templates/student_account/login.underscore b/lms/templates/student_account/login.underscore
index b01e4432d0..6cb07529ea 100644
--- a/lms/templates/student_account/login.underscore
+++ b/lms/templates/student_account/login.underscore
@@ -14,12 +14,12 @@
 
     <%= context.fields %>
 
-    <button class="action action-primary action-update js-login"><%- gettext("Log in") %></button>
+    <button class="action action-primary action-update js-login login-button"><%- gettext("Log in") %></button>
 </form>
 
 <% _.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 %>">
+        <button type="submit" class="button button-primary button-<%- provider.name %> login-provider login-<%- provider.name %>" 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 d588940666..01ffe07f47 100644
--- a/lms/templates/student_account/register.underscore
+++ b/lms/templates/student_account/register.underscore
@@ -8,7 +8,7 @@
 <% } 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 %>">
+            <button type="submit" class="button button-primary button-<%- provider.name %> login-provider register-<%- provider.name %>" data-provider-url="<%- provider.registerUrl %>">
                 <span class="icon <%- provider.iconClass %>" aria-hidden="true"></span>
                 <%- _.sprintf(gettext("Register using %(name)s"), provider) %>
             </button>
@@ -24,5 +24,5 @@
 
     <%= context.fields %>
 
-    <button class="action action-primary action-update js-register"><%- gettext("Register") %></button>
+    <button class="action action-primary action-update js-register register-button"><%- gettext("Register") %></button>
 </form>