diff --git a/assets/controllers/fake_radio_controller.js b/assets/controllers/fake_radio_controller.js
new file mode 100644
index 000000000..a9426a189
--- /dev/null
+++ b/assets/controllers/fake_radio_controller.js
@@ -0,0 +1,13 @@
+import { Controller } from '@hotwired/stimulus';
+
+export default class extends Controller {
+  static targets = ['emailTwoFactor', 'googleTwoFactor'];
+
+  uncheckGoogle() {
+    this.googleTwoFactorTarget.checked = false;
+  }
+
+  uncheckEmail() {
+    this.emailTwoFactorTarget.checked = false;
+  }
+}
diff --git a/assets/index.js b/assets/index.js
index 2b3e6a976..c6aac7bc0 100755
--- a/assets/index.js
+++ b/assets/index.js
@@ -43,24 +43,6 @@ $(document).ready(() => {
       }
     };
   });
-
-  // mimic radio button because emailTwoFactor is a boolean
-  $('#update_user_googleTwoFactor').on('change', () => {
-    $('#update_user_emailTwoFactor').prop('checked', false);
-  });
-
-  $('#update_user_emailTwoFactor').on('change', () => {
-    $('#update_user_googleTwoFactor').prop('checked', false);
-  });
-
-  // same mimic for super admin
-  $('#user_googleTwoFactor').on('change', () => {
-    $('#user_emailTwoFactor').prop('checked', false);
-  });
-
-  $('#user_emailTwoFactor').on('change', () => {
-    $('#user_googleTwoFactor').prop('checked', false);
-  });
 });
 
 (function darkTheme() {
diff --git a/templates/User/edit.html.twig b/templates/User/edit.html.twig
index 9c3edeefa..475472d50 100644
--- a/templates/User/edit.html.twig
+++ b/templates/User/edit.html.twig
@@ -48,16 +48,16 @@
                                     </div>
                                 </div>
 
-                                <div class="row">
+                                <div class="row" data-controller="fake-radio">
                                     <div class="input-field col s12">
                                         <label for="{{ edit_form.emailTwoFactor.vars.id }}">
-                                            {{ form_widget(edit_form.emailTwoFactor) }}
+                                            {{ form_widget(edit_form.emailTwoFactor, {attr: {'data-fake-radio-target': 'emailTwoFactor', 'data-action': 'fake-radio#uncheckGoogle'}}) }}
                                             <span>{{ edit_form.emailTwoFactor.vars.label|trans }}</span>
                                         </label>
                                     </div>
                                     <div class="input-field col s12">
                                         <label for="{{ edit_form.googleTwoFactor.vars.id }}">
-                                            {{ form_widget(edit_form.googleTwoFactor) }}
+                                            {{ form_widget(edit_form.googleTwoFactor, {attr: {'data-fake-radio-target': 'googleTwoFactor', 'data-action': 'fake-radio#uncheckEmail'}}) }}
                                             <span>{{ edit_form.googleTwoFactor.vars.label|trans }}</span>
                                         </label>
                                     </div>