diff --git a/framework/core/js/forum/src/components/ChangeEmailModal.js b/framework/core/js/forum/src/components/ChangeEmailModal.js
index ba32e9fd0..7136fb95c 100644
--- a/framework/core/js/forum/src/components/ChangeEmailModal.js
+++ b/framework/core/js/forum/src/components/ChangeEmailModal.js
@@ -34,16 +34,14 @@ export default class ChangeEmailModal extends Modal {
 
   content() {
     if (this.success) {
-      const emailProviderName = this.email().split('@')[1];
-
       return (
         <div className="Modal-body">
           <div className="Form Form--centered">
             <p className="helpText">{app.trans('core.change_email_confirmation_message', {email: <strong>{this.email()}</strong>})}</p>
             <div className="Form-group">
-              <a href={'http://' + emailProviderName} className="Button Button--primary Button--block">
-                {app.trans('core.change_email_go_to_button', {url: emailProviderName})}
-              </a>
+              <Button className="Button Button--primary Button--block" onclick={this.hide.bind(this)}>
+                {app.trans('core.change_email_dismiss_button')}
+              </Button>
             </div>
           </div>
         </div>
diff --git a/framework/core/js/forum/src/components/ForgotPasswordModal.js b/framework/core/js/forum/src/components/ForgotPasswordModal.js
index e3a5b06ec..9c98bc413 100644
--- a/framework/core/js/forum/src/components/ForgotPasswordModal.js
+++ b/framework/core/js/forum/src/components/ForgotPasswordModal.js
@@ -40,16 +40,14 @@ export default class ForgotPasswordModal extends Modal {
 
   content() {
     if (this.success) {
-      const emailProviderName = this.email().split('@')[1];
-
       return (
         <div className="Modal-body">
           <div className="Form Form--centered">
             <p className="helpText">{app.trans('core.forgot_password_email_sent_message')}</p>
             <div className="Form-group">
-              <a href={'http://' + emailProviderName} className="Button Button--primary Button--block">
-                {app.trans('core.forgot_password_go_to_button', {url: emailProviderName})}
-              </a>
+              <Button className="Button Button--primary Button--block" onclick={this.hide.bind(this)}>
+                {app.trans('core.forgot_password_dismiss_button')}
+              </Button>
             </div>
           </div>
         </div>
diff --git a/framework/core/js/forum/src/components/SignUpModal.js b/framework/core/js/forum/src/components/SignUpModal.js
index ceffc9a67..2186bf52b 100644
--- a/framework/core/js/forum/src/components/SignUpModal.js
+++ b/framework/core/js/forum/src/components/SignUpModal.js
@@ -108,7 +108,6 @@ export default class SignUpModal extends Modal {
 
     if (this.welcomeUser) {
       const user = this.welcomeUser;
-      const emailProviderName = user.email().split('@')[1];
 
       const fadeIn = (element, isInitialized) => {
         if (isInitialized) return;
@@ -125,9 +124,9 @@ export default class SignUpModal extends Modal {
               <p>{app.trans('core.sign_up_confirmation_message', {email: <strong>{user.email()}</strong>})}</p>
 
               <p>
-                <a href={`http://${emailProviderName}`} className="Button Button--primary" target="_blank">
-                  {app.trans('core.sign_up_go_to_button', {url: emailProviderName})}
-                </a>
+                <Button className="Button Button--primary" onclick={this.hide.bind(this)}>
+                  {app.trans('core.sign_up_dismiss_button')}
+                </Button>
               </p>
             </div>
           </div>