diff --git a/app/controllers/submit_form_controller.rb b/app/controllers/submit_form_controller.rb
index 642c3119..621849eb 100644
--- a/app/controllers/submit_form_controller.rb
+++ b/app/controllers/submit_form_controller.rb
@@ -7,8 +7,6 @@ class SubmitFormController < ApplicationController
   skip_before_action :authenticate_user!
   skip_authorization_check
 
-  before_action :maybe_redirect_com, only: %i[show completed]
-
   CONFIG_KEYS = [].freeze
 
   def show
diff --git a/lib/replace_email_variables.rb b/lib/replace_email_variables.rb
index f403b82c..572fd0a4 100644
--- a/lib/replace_email_variables.rb
+++ b/lib/replace_email_variables.rb
@@ -19,6 +19,8 @@ module ReplaceEmailVariables
   DOCUMENTS_LINKS = /\{+documents\.links\}+/i
   DOCUMENTS_LINK = /\{+documents\.link\}+/i
 
+  EMAIL_HOST = ENV.fetch('EMAIL_HOST', nil)
+
   module_function
 
   # rubocop:disable Metrics
@@ -64,10 +66,17 @@ module ReplaceEmailVariables
 
   def build_submitter_link(submitter, tracking_event_type)
     if tracking_event_type == 'click_email'
+      url_options =
+        if EMAIL_HOST.present?
+          { host: EMAIL_HOST, protocol: ENV['FORCE_SSL'].present? ? 'https' : 'http' }
+        else
+          Docuseal.default_url_options
+        end
+
       Rails.application.routes.url_helpers.submit_form_url(
         slug: submitter.slug,
         t: SubmissionEvents.build_tracking_param(submitter, 'click_email'),
-        **Docuseal.default_url_options
+        **url_options
       )
     else
       Rails.application.routes.url_helpers.submit_form_url(