diff --git a/openshift/maintenance/index.html b/openshift/maintenance/index.html
index a92606c6..b75b0f54 100755
--- a/openshift/maintenance/index.html
+++ b/openshift/maintenance/index.html
@@ -31,7 +31,7 @@
   <article class="hero-text">
       <h1>We&rsquo;ll be back shortly!</h1>
       <div>
-          <p>Our website is currently undergoing maintenance. If you have any questions, please contact us at epicsupport.eao@gov.bc.ca.</p>
+          <p>Our website is currently undergoing maintenance. If you have any questions, please contact us at EAO.EPICsystem@gov.bc.ca.</p>
           <p>&mdash; B.C. Environmental Assessment Digital Services Team</p>
       </div>
   </article>
diff --git a/src/app/cac-unsubscribe/cac-unsubscribe.component.html b/src/app/cac-unsubscribe/cac-unsubscribe.component.html
index eaae5ace..aa3a53f3 100644
--- a/src/app/cac-unsubscribe/cac-unsubscribe.component.html
+++ b/src/app/cac-unsubscribe/cac-unsubscribe.component.html
@@ -36,7 +36,7 @@ <h1>Unsubcribe from Community Advisory Committee</h1>
             </button>
           </div>
           <div class="form-group">
-            <label>If you are experiencing any issues with unsubscribing please send an email to <a href="mailto:epicsupport.eao@gov.bc.ca">epicsupport.eao@gov.bc.ca</a></label>
+            <label>If you are experiencing any issues with unsubscribing please send an email to <a href="mailto:EAO.EPICsystem@gov.bc.ca">EAO.EPICsystem@gov.bc.ca</a></label>
           </div>
         </form>
       </main>
diff --git a/src/app/comments/add-comment/add-comment.component.html b/src/app/comments/add-comment/add-comment.component.html
index 5081a37b..c338305c 100644
--- a/src/app/comments/add-comment/add-comment.component.html
+++ b/src/app/comments/add-comment/add-comment.component.html
@@ -35,7 +35,7 @@ <h2>How it Works</h2>
       <section class="m-b-0 mt-5">
         <h2>Collection Notice</h2>
         <p>Your personal information is collected by the Environmental Assessment Office for the purpose of commenting on the <em>{{project.name}} Project</em> under the authority of s.26(c) of the <a href="http://www.bclaws.ca/Recon/document/ID/freeside/96165_00" target="_blank">Freedom of Information and Protection of Privacy Act</a>. In submitting your comment, you consent to your comment being published online and shared with the proponent. This consent is valid from this date forward and may be revoked by contacting the EAO representative below. Should you have any questions about this collection please contact:</p>
-        <p class="m-b-0">Director, Digital Services<br>Environmental Assessment Office<br>836 Yates Street, Victoria, BC<br><a href="mailto: epicsupport.eao@gov.bc.ca">epicsupport.eao@gov.bc.ca</a><br>(250) 356-7441
+        <p class="m-b-0">Director, Digital Services<br>Environmental Assessment Office<br>836 Yates Street, Victoria, BC<br><a href="mailto: EAO.EPICsystem@gov.bc.ca">EAO.EPICsystem@gov.bc.ca</a><br>(250) 356-7441
       </section>
     </div>
     <div class="modal-footer">
@@ -165,7 +165,7 @@ <h5 class="modal-title">Member Sign-up</h5>
             <ul class="font-italic understandText m-0">Director, Digital Services</ul>
             <ul class="font-italic understandText m-0">Environmental Assessment Office</ul>
             <ul class="font-italic understandText m-0">836 Yates Street, Victoria, BC</ul>
-            <ul class="font-italic understandText m-0">epicsupport.eao@gov.bc.ca</ul>
+            <ul class="font-italic understandText m-0">EAO.EPICsystem@gov.bc.ca</ul>
             <ul class="font-italic understandText m-0 mb-2">(250) 356-7441</ul>
           <div class="form-control-container">
             <label class="control-label" >