diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index a159489fe..3a53de344 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -77,7 +77,7 @@ postAdminTestR = do
     (FormFailure errs) -> forM_ errs $ addMessage Error . toHtml
 
   let emailWidget' = [whamlet|
-        <form method=post action=@{AdminTestR} enctype=#{emailEnctype}>
+        <form method=post action=@{AdminTestR} enctype=#{emailEnctype} data-ajax-submit>
           ^{emailWidget}
       |]
 
diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index b3b874ee3..5aa898014 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -10,6 +10,7 @@
   var OVERLAY_CLASS = 'modal__overlay';
   var OVERLAY_OPEN_CLASS = 'modal__overlay--open';
   var CLOSER_CLASS = 'modal__closer';
+  var AJAX_SUBMIT_FLAG = 'ajaxSubmit'
 
   window.utils.modal = function(modalElement, options) {
 
@@ -40,7 +41,7 @@
       document.body.insertBefore(modalElement, null);
 
       var form = modalElement.querySelector('form');
-      if (form) {
+      if (form && AJAX_SUBMIT_FLAG in form.dataset) {
         setupForm(form);
       }
 
@@ -75,7 +76,7 @@
         }).then(function(response) {
           // TODO: process json response once backend returns json
         }).catch(function(error) {
-          console.error('could not fetch or process response from ' + url, error);
+          console.error('could not fetch or process response from ' + url, { error });
         });
       });
     }