diff --git a/common/app/routes/settings/components/Social-Settings.jsx b/common/app/routes/settings/components/Social-Settings.jsx
index bfe2b0d12e..f1a3691ce7 100644
--- a/common/app/routes/settings/components/Social-Settings.jsx
+++ b/common/app/routes/settings/components/Social-Settings.jsx
@@ -8,7 +8,7 @@ export default function SocialSettings({
   isLinkedIn
 }) {
   const githubCopy = isGithubCool ?
-    'Update my portfolio from GitHub' :
+    'Update my profile from GitHub' :
     'Link my GitHub to unlock my portfolio';
   const buttons = [
     <Button
diff --git a/server/boot/home.js b/server/boot/home.js
index f788e8e17c..e514b6c597 100644
--- a/server/boot/home.js
+++ b/server/boot/home.js
@@ -1,5 +1,6 @@
 import { defaultProfileImage } from '../../common/utils/constantStrings.json';
 import supportedLanguages from '../../common/utils/supported-languages';
+import dedent from 'dedent';
 
 const message =
   'Learn to Code and Help Nonprofits';
@@ -33,9 +34,22 @@ module.exports = function(app) {
     if (!supportedLanguages[req._urlLang]) {
       return next();
     }
+    const referer = req.headers.referer;
 
     if (req.user) {
-      return res.redirect('/challenges/current-challenge');
+      if ((referer.indexOf('/settings') >= 1) && (req.user.isGithubCool)) {
+
+        const msg = dedent`
+              We've updated your profile based
+              on your your GitHub account.
+            `;
+        const username = req.user.username;
+
+        req.flash('info', { msg: msg});
+        return res.redirect(`/${username}`);
+      } else {
+        return res.redirect('/challenges/current-challenge');
+      }
     }
 
     return res.render('home', { title: message });