diff --git a/src/App.js b/src/App.js
index df8cf8b7f0908163dd7b949d82337abd67f43808..02060634e7ce9d541fa9e8c29eee4d9a76e7fdb6 100644
--- a/src/App.js
+++ b/src/App.js
@@ -65,6 +65,7 @@ class App extends React.Component {
         thankYou: <ThankYou 
           singleFamily={false}
           waitList={false}
+          oakland={false}
           milwaukee={false}
         />,
         congrats: <Congrats
@@ -959,6 +960,13 @@ class App extends React.Component {
       />;
     }
 
+    // Oakland Survey ID = 2
+    if(this.props.building.data.surveyId === 2) {
+      this.state.pages.thankYou = <ThankYou
+        oakland={true}
+      />;
+    }
+
     // Milwaukee Survey ID = 3
     if(this.props.building.data.surveyId === 3) {
       this.state.pages.thankYou = <ThankYou
diff --git a/src/ThankYou.js b/src/ThankYou.js
index 516cb63aaf231fb85bd6ddbbd6d29f6c3aa8bafa..7194812a6ab7b71ec5f73b5a18bd058578eac69a 100644
--- a/src/ThankYou.js
+++ b/src/ThankYou.js
@@ -38,14 +38,20 @@ export default class ThankYou extends React.Component {
       </div>
     } 
 
-    if (this.props.milwaukee === true) {
+    if (this.props.oakland === true ||this.props.milwaukee === true) {
+      const email = this.props.milwaukee === true ?
+        "welcome.milwaukee@blocpower.io":
+        "welcome.oakland@blocpower.io"
+      const emailURL = this.props.milwaukee === true ?
+        "mailto:welcome.milwaukee@blocpower.io":
+        "mailto:welcome.oakland@blocpower.io"
       data = 
         <div>
           Looks like we need more information to see what energy saving projects are a good fit for your building.
           <br />
           We’ll send you an email to find a time to chat or you 
           can <span className="callUs">call us at {process.env.REACT_APP_BLOCPOWER_CONTACT} </span> 
-          or <span className="callUs">email us at <a href="mailto:welcome.milwaukee@blocpower.io" target="_top">welcome.milwaukee@blocpower.io</a>.</span>
+          or <span className="callUs">email us at <a href={emailURL} target="_top">{email}</a>.</span>
         </div> 
     }