diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 931a5b88e35..a74f67b4df5 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -88,7 +88,11 @@
   <p class="margin-y-1">
     <%= new_tab_link_to(
           t('notices.privacy.privacy_act_statement'),
-          MarketingSite.privacy_act_statement_url,
+          policy_redirect_url(
+            policy: :privacy_act_statement,
+            flow: :sign_in,
+            step: :sign_in,
+          ),
         ) %>
   </p>
 <% end %>
diff --git a/app/views/sign_up/registrations/new.html.erb b/app/views/sign_up/registrations/new.html.erb
index d031aa25dc8..2e24d495d62 100644
--- a/app/views/sign_up/registrations/new.html.erb
+++ b/app/views/sign_up/registrations/new.html.erb
@@ -50,13 +50,21 @@
 <p class='margin-top-2'>
   <%= new_tab_link_to(
         t('notices.privacy.security_and_privacy_practices'),
-        MarketingSite.security_and_privacy_practices_url,
+        policy_redirect_url(
+          policy: :security_and_privacy_practices,
+          flow: :create_account,
+          step: :enter_email,
+        ),
       ) %>
 </p>
 
 <p>
   <%= new_tab_link_to(
         t('notices.privacy.privacy_act_statement'),
-        MarketingSite.privacy_act_statement_url,
+        policy_redirect_url(
+          policy: :privacy_act_statement,
+          flow: :create_account,
+          step: :enter_email,
+        ),
       ) %>
 </p>
diff --git a/spec/views/devise/sessions/new.html.erb_spec.rb b/spec/views/devise/sessions/new.html.erb_spec.rb
index 5e68ebcf6c5..af563e5d6c4 100644
--- a/spec/views/devise/sessions/new.html.erb_spec.rb
+++ b/spec/views/devise/sessions/new.html.erb_spec.rb
@@ -63,7 +63,11 @@
 
     expect(rendered).to have_link(
       t('notices.privacy.privacy_act_statement'),
-      href: MarketingSite.privacy_act_statement_url,
+      href: policy_redirect_url(
+        policy: :privacy_act_statement,
+        flow: :sign_in,
+        step: :sign_in,
+      ),
     ) { |link| link[:target] == '_blank' && link[:rel] == 'noopener noreferrer' }
   end
 
diff --git a/spec/views/sign_up/registrations/new.html.erb_spec.rb b/spec/views/sign_up/registrations/new.html.erb_spec.rb
index f0000703d30..97a2c1f0e45 100644
--- a/spec/views/sign_up/registrations/new.html.erb_spec.rb
+++ b/spec/views/sign_up/registrations/new.html.erb_spec.rb
@@ -73,15 +73,22 @@
   it 'includes a link to security / privacy page and privacy statement act' do
     render
 
-    expect(rendered).
-      to have_link(
-        t('notices.privacy.security_and_privacy_practices'),
-        href: MarketingSite.security_and_privacy_practices_url,
-      )
-    expect(rendered).
-      to have_selector(
-        "a[href='#{MarketingSite.security_and_privacy_practices_url}']\
-[target='_blank'][rel='noopener noreferrer']",
-      )
+    expect(rendered).to have_link(
+      t('notices.privacy.security_and_privacy_practices'),
+      href: policy_redirect_url(
+        policy: :security_and_privacy_practices,
+        flow: :create_account,
+        step: :enter_email,
+      ),
+    ) { |link| link[:target] == '_blank' && link[:rel] == 'noopener noreferrer' }
+
+    expect(rendered).to have_link(
+      t('notices.privacy.privacy_act_statement'),
+      href: policy_redirect_url(
+        policy: :privacy_act_statement,
+        flow: :create_account,
+        step: :enter_email,
+      ),
+    ) { |link| link[:target] == '_blank' && link[:rel] == 'noopener noreferrer' }
   end
 end