diff --git a/app.js b/app.js
index 7a74838..5428dc5 100644
--- a/app.js
+++ b/app.js
@@ -6,7 +6,7 @@ var hbs = require('hbs');
 var app = express();
 
 app.set('view engine', 'hbs');
-app.set('trust proxy', 'loopback');
+app.enable('trust proxy');
 
 function isSetup() {
   return (process.env.CONSUMER_KEY != null) && (process.env.CONSUMER_SECRET != null);
@@ -66,8 +66,12 @@ app.get('/setup', function(req, res) {
     res.redirect('/');
   }
   else {
-    var isRemote = (req.hostname.indexOf('localhost') != 0);
-    res.render('setup', { isRemote: isRemote, oauthCallbackUrl: oauthCallbackUrl(req) });
+    var isLocal = (req.hostname.indexOf('localhost') == 0);
+    var herokuApp = null;
+    if (req.hostname.indexOf('.herokuapp.com') > 0) {
+      herokuApp = req.hostname.replace(".herokuapp.com", "");
+    }
+    res.render('setup', { isLocal: isLocal, oauthCallbackUrl: oauthCallbackUrl(req), herokuApp: herokuApp});
   }
 });
 
diff --git a/views/setup.hbs b/views/setup.hbs
index 8d99e84..b54bbcc 100644
--- a/views/setup.hbs
+++ b/views/setup.hbs
@@ -2,7 +2,7 @@
 
 <ol>
   <li>
-    Setup an OAUTH on Salesforce
+    Setup an OAUTH on Salesforce:
     <ol>
       <li><a href="https://login.salesforce.com/app/mgmt/forceconnectedapps/forceAppEdit.apexp">Create a new Connected App on Salesforce</a></li>
       <li>Fill in the <em>Connected App Name</em>, <em>API Name</em>, and <em>Contact Email</em> fields.</li>
@@ -12,9 +12,16 @@
     </ol>
   </li>
   <li>
-    {{#if isRemote}}
-      Blah
-    {{else}}
+    {{#if herokuApp}}
+      Set the <em>Consumer Key</em> and <em>Consumer Secret</em> values in your Heroku app's config:
+      <ol>
+        <li><a href="https://dashboard.heroku.com/apps/{{herokuApp}}/settings" target="_blank">Open your app's settings</a></li>
+        <li>Click <em>Reveal Config Vars</em></li>
+        <li>Add a new config var named <code>CONSUMER_KEY</code> with the value of your Connected App's Consumer Key</li>
+        <li>Add a new config var named <code>CONSUMER_SECRET</code> with the value of your Connected App's Consumer Secret</li>
+      </ol>
+    {{/if}}
+    {{#if isLocal}}
       Create a new <code>.env</code> file in the root of your project directory containing the following with your newly created <em>Consumer Key</em> and <em>Consumer Secret</em> values:
       <pre><code># DO NOT SHARE THIS FILE OR PUT IT INTO YOUR SCM
 CONSUMER_KEY=YOUR_CONSUMER_KEY