diff --git a/modules/material/themes/material/default/selectidp-links.twig b/modules/material/themes/material/default/selectidp-links.twig
index 9381e88e..bf540b13 100644
--- a/modules/material/themes/material/default/selectidp-links.twig
+++ b/modules/material/themes/material/default/selectidp-links.twig
@@ -38,7 +38,7 @@
       {% if analytics_tracking_id is not empty %}
         gtag('event', 'IdP', {
           'event_category': 'hub',
-          'event_label': 'choice',
+          'event_label': 'choice-disabled',
           'value': id
         });
       {% endif %}
diff --git a/modules/material/themes/material/mfa/new-backup-codes.twig b/modules/material/themes/material/mfa/new-backup-codes.twig
index a9ab1490..1609b3e6 100644
--- a/modules/material/themes/material/mfa/new-backup-codes.twig
+++ b/modules/material/themes/material/mfa/new-backup-codes.twig
@@ -56,7 +56,7 @@
       document.getElementById('copyBtn').addEventListener('click', function() {
         copyCodesToClipboard(this);
       });
-      document.querySelector('input[type="checkbox"]').addEventListener('change', function(e) {
+      document.getElementById('checkbox').addEventListener('change', function(e) {
         contBtn = document.querySelector('button[name="continue"]');
         contBtn.disabled = !e.checked;
       });
@@ -159,7 +159,7 @@
 
       <div layout-children="row" class="fill-parent">
         <label class="mdl-checkbox mdl-js-checkbox" flex>
-          <input type="checkbox" class="mdl-checkbox__input">
+          <input id="checkbox" type="checkbox" class="mdl-checkbox__input">
           <span class="mdl-checkbox__label">{{ '{mfa:new_codes_saved}'|trans }}</span>
         </label>
 
diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig b/modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig
index 42ef14b8..6ea93dc2 100644
--- a/modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig
+++ b/modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig
@@ -64,7 +64,7 @@
         return input;
       }
       
-      document.querySelector('.mdl-button.mdl-color-text--red').addEventListener('click', verifyWebAuthn);
+      document.getElementById('showBtn').addEventListener('click', verifyWebAuthn);
       document.querySelector('body').addEventListener{'load', verifyWebAuthn};
     });
   </script>
@@ -121,6 +121,7 @@
           <span flex></span>
           <!-- used type=button to avoid form submission on click -->
           <button
+            id="showBtn"
             type="button"
             class="mdl-button mdl-color-text--red {{ error_message is empty ? 'hide' : 'show' }}"
           >
diff --git a/modules/material/themes/material/profilereview/review.twig b/modules/material/themes/material/profilereview/review.twig
index a6c6710c..217c086d 100644
--- a/modules/material/themes/material/profilereview/review.twig
+++ b/modules/material/themes/material/profilereview/review.twig
@@ -25,9 +25,8 @@
       }
 
       document.querySelector('body').addEventListener('load', prettifyDates)
-      document.querySelectorA("mdl-button mdl-button--colored").addEventListener('click', function(e) {
-        e.preventDefault()
-        document.querySelector('button').click()
+      document.getElementById('launch').addEventListener('click', function(e) {
+        document.getElementsByName('continue').click()
       });
     });
   </script>
@@ -124,7 +123,7 @@
       </section>
 
       <section layout-children="row" child-spacing="end" class="fill-parent margin">
-        <a href="{{ profile_url }}" target="_blank" rel="noopener"
+        <a id="launch" href="{{ profile_url }}" target="_blank" rel="noopener"
            class="mdl-button mdl-button--colored" layout-children="row">
           {{ '{review:button_update}'|trans }} <i class="material-icons">launch</i>
         </a>