diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index 6df9a5fa7..e300f6a87 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -747,6 +747,7 @@
     thanks_p: "We'll be in touch soon. Questions? Email us:"
     thanks_anon: "Log in or create an account to set up a class, add your students, and monitor their progress as they learn computer science." # {change}
     thanks_logged_in: "Set up a class, add your students, and monitor their progress as they learn computer science." # {change}
+    setup_a_class: "Set Up a Class"
 
   versions:
     save_version_title: "Save New Version"
diff --git a/app/templates/new-home-view.jade b/app/templates/new-home-view.jade
index 153c084a1..fa1e39995 100644
--- a/app/templates/new-home-view.jade
+++ b/app/templates/new-home-view.jade
@@ -186,9 +186,10 @@ block content
         h4(data-i18n="new_home.request_demo_subtitle")
         div
           a.btn.btn-primary.btn-lg(href="/teachers/demo", data-i18n="new_home.request_demo")
-        .have-an-account
-          span.spr(data-i18n="new_home.have_an_account")
-          a.login-button Login
+        if me.isAnonymous()
+          .have-an-account
+            span.spr(data-i18n="new_home.have_an_account")
+            a.login-button Login
 
     h3.text-center(data-i18n="new_home.computer_science")
     h4.text-center
@@ -277,9 +278,10 @@ block content
       else
         div
           a.btn.btn-primary.btn-lg(href="/teachers/demo", data-i18n="new_home.request_demo")
-        .have-an-account
-          span.spr(data-i18n="new_home.have_an_account")
-          a.login-button Login
+        if me.isAnonymous()
+          .have-an-account
+            span.spr(data-i18n="new_home.have_an_account")
+            a.login-button Login
 
 
     #screenshot-lightbox.modal.fade(data-show="false")