diff --git a/api/chalicelib/saas/utils/html/img/logo.png b/api/chalicelib/saas/utils/html/img/logo.png
new file mode 100644
index 000000000..123ca0d76
Binary files /dev/null and b/api/chalicelib/saas/utils/html/img/logo.png differ
diff --git a/api/chalicelib/saas/utils/html/img/weekly/logo.png b/api/chalicelib/saas/utils/html/img/weekly/logo.png
new file mode 100644
index 000000000..123ca0d76
Binary files /dev/null and b/api/chalicelib/saas/utils/html/img/weekly/logo.png differ
diff --git a/api/chalicelib/utils/html/assignment.html b/api/chalicelib/utils/html/assignment.html
index 64d40388b..773141018 100644
--- a/api/chalicelib/utils/html/assignment.html
+++ b/api/chalicelib/utils/html/assignment.html
@@ -403,7 +403,7 @@ width: 25%!important
                                             <!-- <p style="font-size: 18px; line-height: 21px; text-align: center; margin: 0;">
                                                  <span style="font-size: 18px;">Welcome to OpenReplay!</span>
                                              </p>-->
-                                            <h1 style="text-align: center; margin-top: 30px; line-height: 30px">Assigned session</h1>
+                                            <h1 style="text-align: center; margin-top: 30px; line-height: 30px">A recording has been assigned to you</h1>
 
                                         </div>
                                     </div>
@@ -514,9 +514,9 @@ width: 25%!important
                                     <div style="color:#555555;font-family:-apple-system,BlinkMacSystemFont,'Helvetica Neue','Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,sans-serif;line-height:120%;padding-top:10px;padding-right:10px;padding-bottom:10px;padding-left:10px;">
                                         <div style="font-size: 12px; line-height: 14px; color: #555555; font-family: -apple-system,BlinkMacSystemFont,'Helvetica Neue','Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,sans-serif;">
                                             <p style="font-size: 14px; line-height: 16px; text-align: center; margin: 0;">
-                                                <a href="mailto:support@openreplay.com?subject=[User Invite] - Reporting issue"
+                                                <a href="https://github.com/openreplay/openreplay/issues"
                                                    style="text-decoration: underline; color: #009193;"
-                                                   title="support@openreplay.com">Report an issue</a> | <a
+                                                   >Report an issue</a> | <a
                                                     href="https://openreplay.com/" rel="noopener"
                                                     style="text-decoration: underline; color: #009193;" target="_blank">Take
                                                 a tour</a></p>
diff --git a/api/chalicelib/utils/html/img/logo.png b/api/chalicelib/utils/html/img/logo.png
index 56b14d369..1ee304b45 100644
Binary files a/api/chalicelib/utils/html/img/logo.png and b/api/chalicelib/utils/html/img/logo.png differ
diff --git a/api/chalicelib/utils/html/img/weekly/logo.png b/api/chalicelib/utils/html/img/weekly/logo.png
index b7440013c..1ee304b45 100644
Binary files a/api/chalicelib/utils/html/img/weekly/logo.png and b/api/chalicelib/utils/html/img/weekly/logo.png differ
diff --git a/api/chalicelib/utils/html/invitation.html b/api/chalicelib/utils/html/invitation.html
index 76b7e2d61..079d8b824 100644
--- a/api/chalicelib/utils/html/invitation.html
+++ b/api/chalicelib/utils/html/invitation.html
@@ -553,9 +553,9 @@ width: 25%!important
                                 <div style="color:#555555;font-family:-apple-system,BlinkMacSystemFont,'Helvetica Neue','Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,sans-serif;line-height:120%;padding-top:10px;padding-right:10px;padding-bottom:10px;padding-left:10px;">
                                     <div style="font-size: 12px; line-height: 14px; color: #555555; font-family: -apple-system,BlinkMacSystemFont,'Helvetica Neue','Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,sans-serif;">
                                         <p style="font-size: 14px; line-height: 16px; text-align: center; margin: 0;">
-                                            <a href="mailto:support@openreplay.com?subject=[User Invite] - Reporting issue"
+                                            <a href="https://github.com/openreplay/openreplay/issues"
                                                style="text-decoration: underline; color: #009193;"
-                                               title="support@openreplay.com">Report an issue</a> | <a
+                                               >Report an issue</a> | <a
                                                 href="https://openreplay.com/" rel="noopener"
                                                 style="text-decoration: underline; color: #009193;" target="_blank">Take
                                             a tour</a></p>
diff --git a/api/env_handler.py b/api/env_handler.py
index 3eb7e2ad8..d56dd17c8 100644
--- a/api/env_handler.py
+++ b/api/env_handler.py
@@ -5,6 +5,8 @@ with open('.chalice/config.json') as json_file:
     data = json.load(json_file)
     stages = data.get("stages", {})
     for s in stages.keys():
+        if environ.get("SITE_URL") is None or environ["SITE_URL"] == '':
+            environ["SITE_URL"] = environ.get("S3_HOST", "")
         data["stages"][s]["environment_variables"] = {**stages[s].get("environment_variables", {}), **environ}
 with open('.chalice/config.json', 'w') as outfile:
     json.dump(data, outfile, indent=2, sort_keys=True)
diff --git a/ee/api/chalicelib/utils/html/assignment.html b/ee/api/chalicelib/utils/html/assignment.html
index 64d40388b..773141018 100644
--- a/ee/api/chalicelib/utils/html/assignment.html
+++ b/ee/api/chalicelib/utils/html/assignment.html
@@ -403,7 +403,7 @@ width: 25%!important
                                             <!-- <p style="font-size: 18px; line-height: 21px; text-align: center; margin: 0;">
                                                  <span style="font-size: 18px;">Welcome to OpenReplay!</span>
                                              </p>-->
-                                            <h1 style="text-align: center; margin-top: 30px; line-height: 30px">Assigned session</h1>
+                                            <h1 style="text-align: center; margin-top: 30px; line-height: 30px">A recording has been assigned to you</h1>
 
                                         </div>
                                     </div>
@@ -514,9 +514,9 @@ width: 25%!important
                                     <div style="color:#555555;font-family:-apple-system,BlinkMacSystemFont,'Helvetica Neue','Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,sans-serif;line-height:120%;padding-top:10px;padding-right:10px;padding-bottom:10px;padding-left:10px;">
                                         <div style="font-size: 12px; line-height: 14px; color: #555555; font-family: -apple-system,BlinkMacSystemFont,'Helvetica Neue','Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,sans-serif;">
                                             <p style="font-size: 14px; line-height: 16px; text-align: center; margin: 0;">
-                                                <a href="mailto:support@openreplay.com?subject=[User Invite] - Reporting issue"
+                                                <a href="https://github.com/openreplay/openreplay/issues"
                                                    style="text-decoration: underline; color: #009193;"
-                                                   title="support@openreplay.com">Report an issue</a> | <a
+                                                   >Report an issue</a> | <a
                                                     href="https://openreplay.com/" rel="noopener"
                                                     style="text-decoration: underline; color: #009193;" target="_blank">Take
                                                 a tour</a></p>
diff --git a/ee/api/chalicelib/utils/html/img/logo.png b/ee/api/chalicelib/utils/html/img/logo.png
index 56b14d369..1ee304b45 100644
Binary files a/ee/api/chalicelib/utils/html/img/logo.png and b/ee/api/chalicelib/utils/html/img/logo.png differ
diff --git a/ee/api/chalicelib/utils/html/img/weekly/logo.png b/ee/api/chalicelib/utils/html/img/weekly/logo.png
index b7440013c..1ee304b45 100644
Binary files a/ee/api/chalicelib/utils/html/img/weekly/logo.png and b/ee/api/chalicelib/utils/html/img/weekly/logo.png differ
diff --git a/ee/api/chalicelib/utils/html/invitation.html b/ee/api/chalicelib/utils/html/invitation.html
index 76b7e2d61..079d8b824 100644
--- a/ee/api/chalicelib/utils/html/invitation.html
+++ b/ee/api/chalicelib/utils/html/invitation.html
@@ -553,9 +553,9 @@ width: 25%!important
                                 <div style="color:#555555;font-family:-apple-system,BlinkMacSystemFont,'Helvetica Neue','Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,sans-serif;line-height:120%;padding-top:10px;padding-right:10px;padding-bottom:10px;padding-left:10px;">
                                     <div style="font-size: 12px; line-height: 14px; color: #555555; font-family: -apple-system,BlinkMacSystemFont,'Helvetica Neue','Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,sans-serif;">
                                         <p style="font-size: 14px; line-height: 16px; text-align: center; margin: 0;">
-                                            <a href="mailto:support@openreplay.com?subject=[User Invite] - Reporting issue"
+                                            <a href="https://github.com/openreplay/openreplay/issues"
                                                style="text-decoration: underline; color: #009193;"
-                                               title="support@openreplay.com">Report an issue</a> | <a
+                                               >Report an issue</a> | <a
                                                 href="https://openreplay.com/" rel="noopener"
                                                 style="text-decoration: underline; color: #009193;" target="_blank">Take
                                             a tour</a></p>
diff --git a/ee/api/env_handler.py b/ee/api/env_handler.py
index 3eb7e2ad8..d56dd17c8 100644
--- a/ee/api/env_handler.py
+++ b/ee/api/env_handler.py
@@ -5,6 +5,8 @@ with open('.chalice/config.json') as json_file:
     data = json.load(json_file)
     stages = data.get("stages", {})
     for s in stages.keys():
+        if environ.get("SITE_URL") is None or environ["SITE_URL"] == '':
+            environ["SITE_URL"] = environ.get("S3_HOST", "")
         data["stages"][s]["environment_variables"] = {**stages[s].get("environment_variables", {}), **environ}
 with open('.chalice/config.json', 'w') as outfile:
     json.dump(data, outfile, indent=2, sort_keys=True)