diff --git a/playbooks/roles/forum/defaults/main.yml b/playbooks/roles/forum/defaults/main.yml
index 49afa02f867..2d47cd02a71 100644
--- a/playbooks/roles/forum/defaults/main.yml
+++ b/playbooks/roles/forum/defaults/main.yml
@@ -93,6 +93,7 @@ forum_base_env: &forum_base_env
   DD_TAGS: "{{ FORUM_DD_TAGS }}"
   DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT: "true"
   DD_TRACE_LOG_STREAM_HANDLER: "false"
+  ENABLE_DATA_DOG: "{{ COMMON_ENABLE_DATADOG }}"
 
 forum_env:
   <<: *forum_base_env
diff --git a/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/prospectus.j2 b/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/prospectus.j2
index 5f64e56dab1..bd1ff215486 100644
--- a/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/prospectus.j2
+++ b/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/prospectus.j2
@@ -119,7 +119,7 @@ server {
     proxy_pass_request_headers off;
   {% endif %}
   }
-  
+
   # favicon is requested a lot.  cache it at the edge.
 
   location /favicon.ico {
@@ -176,6 +176,21 @@ server {
   {% endif %}
   }
 
+  location /password_reset_confirm/ {
+  {% if PROSPECTUS_S3_HOSTING_PROXY_ENABLED %}
+    rewrite ^ /{{ PROSPECTUS_S3_HOSTING_PREFIX }}/password_reset_confirm/index.html break;
+    proxy_pass {{ PROSPECTUS_S3_HOSTING_BUCKET_URL }}/{{ PROSPECTUS_S3_HOSTING_PREFIX }}/password_reset_confirm/index.html;
+    # Hide client headers from S3 to prevent request headers too big error
+    proxy_pass_request_headers off;
+    # proxy_redirect ensures redirects from s3 are rewritten
+    # For example it will fix a redirect from s3 to prevent /school/mitx from trying to redirect to /924c142-1/school/mitx/
+    # The second parameter being " " is to prevent nginx sticking http://hostname in front of the location directive
+    proxy_redirect "/{{ PROSPECTUS_S3_HOSTING_PREFIX }}" " ";
+  {% else %}
+    try_files $uri $uri/ /password_reset_confirm/index.html;
+  {% endif %}
+  }
+
   # preview pages are not cached, and have basic auth
 
   location /secure-preview/ {
@@ -218,7 +233,7 @@ server {
   }
   {% endfor %}
 
-    
+
 
   {% if prospectus_redirect_file is defined %}
         include fastcgi_params;