diff --git a/app/templates/courses/courses-view.jade b/app/templates/courses/courses-view.jade
index 334fc72f5..657e9c395 100644
--- a/app/templates/courses/courses-view.jade
+++ b/app/templates/courses/courses-view.jade
@@ -88,6 +88,10 @@ block content
                 +course-instance-body(courseInstance)
                 .clearfix
         
+      else
+        .text-center
+          button#start-new-game-btn.btn.btn-success.btn-lg Start New Game
+        
       h3.text-uppercase Join A Class
       hr
       
diff --git a/app/views/courses/ChooseLanguageModal.coffee b/app/views/courses/ChooseLanguageModal.coffee
index e7a40ac0d..7d8fe3f26 100644
--- a/app/views/courses/ChooseLanguageModal.coffee
+++ b/app/views/courses/ChooseLanguageModal.coffee
@@ -9,6 +9,7 @@ module.exports = class ChooseLanguageModal extends ModalView
     'click .lang-choice-btn': 'onClickLanguageChoiceButton'
     
   initialize: (options) ->
+    options ?= {}
     @logoutFirst = options.logoutFirst
 
   onClickLanguageChoiceButton: (e) ->
diff --git a/app/views/courses/CoursesView.coffee b/app/views/courses/CoursesView.coffee
index 9196d89c2..f23be2d4a 100644
--- a/app/views/courses/CoursesView.coffee
+++ b/app/views/courses/CoursesView.coffee
@@ -5,6 +5,7 @@ template = require 'templates/courses/courses-view'
 StudentLogInModal = require 'views/courses/StudentLogInModal'
 StudentSignUpModal = require 'views/courses/StudentSignUpModal'
 ChangeCourseLanguageModal = require 'views/courses/ChangeCourseLanguageModal'
+ChooseLanguageModal = require 'views/courses/ChooseLanguageModal'
 CourseInstance = require 'models/CourseInstance'
 CocoCollection = require 'collections/CocoCollection'
 Course = require 'models/Course'
@@ -62,7 +63,12 @@ module.exports = class CoursesView extends RootView
       @joinClass()
 
   onClickStartNewGameButton: ->
-    @openSignUpModal()
+    if me.isAnonymous()
+      @openSignUpModal()
+    else
+      modal = new ChooseLanguageModal()
+      @openModalView(modal)
+      @listenToOnce modal, 'set-language', @startHourOfCodePlay
 
   onClickLogInButton: ->
     modal = new StudentLogInModal()