diff --git a/controllers/resources.js b/controllers/resources.js
index b8f4f3e974..e8fbb0a6ee 100644
--- a/controllers/resources.js
+++ b/controllers/resources.js
@@ -74,14 +74,13 @@ module.exports = {
     },
 
     chat: function chat(req, res) {
-        if (req.user) {
-          if (req.user.sentSlackInvite) {
+        if (req.user && req.user.sentSlackInvite) {
             res.redirect('https://freecode.slack.com/messages/general/');
-          }
+        } else {
+            res.render('resources/chat', {
+                title: "Join our chat room"
+            });
         }
-        res.render('resources/chat', {
-            title: "Enter Free Code Camp's Chat Rooms"
-        });
     },
 
     nonprofitProjectInstructions: function nonprofitProjectInstructions(req, res) {
diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade
index f457302b67..2db9c5016e 100644
--- a/views/partials/navbar.jade
+++ b/views/partials/navbar.jade
@@ -14,7 +14,7 @@
         li
             a(href='/challenges') Challenges
         li
-            a(href='/chat') Chat
+            a(href='/chat', target='_blank') Chat
         li
             a(href='/stories/hot') News
         li
diff --git a/views/resources/learn-to-code.jade b/views/resources/learn-to-code.jade
index 16624e20bf..18291a5f2e 100644
--- a/views/resources/learn-to-code.jade
+++ b/views/resources/learn-to-code.jade
@@ -5,7 +5,7 @@ block content
     .text-center
         if (user)
             if (!user.sentSlackInvite)
-                a.btn.btn-primary.signup-btn.next-challenge-button(href="/api/slack") Join our Slack Chat Room
+                a.btn.btn-primary.btn-cta.next-challenge-button(href="/api/slack") Join our Slack Chat Room
                 .spacer
             a.btn.btn-cta.signup-btn.next-challenge-button(href="/challenges") Take me to my next challenge
         else