diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index dbdc97210e..9eb7ffb7d2 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -118,7 +118,8 @@ def index(request):
                         course.location.org,
                         course.location.course,
                         course.location.name]))
-                    for course in courses]
+                    for course in courses],
+        'user': request.user
     })
 
 
diff --git a/cms/templates/index.html b/cms/templates/index.html
index 69058e4db3..8a9c3b3ef6 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.html
@@ -23,6 +23,7 @@
 		<div class="inner-wrapper">
 			<h1>My Courses</h1>
 			<article class="my-classes">
+				% if user.is_active:
 				<a href="#" class="new-course-button"><span class="plus-icon"></span> New Course</a>
 				<ul class="class-list">
 					%for course, url in courses:
@@ -35,8 +36,15 @@
 							-->
 						</a>
 					</li>
-			    %endfor
+			    	%endfor
 				</ul>
+				% else:
+					<div class='warn-msg'>
+						<p>
+						In order to start authoring courses using edX studio, please click on the activation link in your email.
+						</p>
+					</div>
+				% endif
 			</article>
 		</div>
 	</div>
diff --git a/cms/templates/login.html b/cms/templates/login.html
index a604024804..3c834bb299 100644
--- a/cms/templates/login.html
+++ b/cms/templates/login.html
@@ -55,10 +55,11 @@
         if(json.success) {
           location.href = "${reverse('index')}";
         } else if($('#login_error').length == 0) {
-          $('#login_form').prepend('<div id="login_error">Email or password is incorrect.</div>');
+          $('#login_form').prepend('<div id="login_error">' + json.value + '</div>');
           $('#login_error').slideDown(150);
         } else {
           $('#login_error').stop().slideDown(150);
+          $('#login_error').html(json.value);
         }
       }
     );
diff --git a/cms/templates/signup.html b/cms/templates/signup.html
index 93acdfad71..150658b75e 100644
--- a/cms/templates/signup.html
+++ b/cms/templates/signup.html
@@ -1,4 +1,6 @@
 <%inherit file="base.html" />
+<%! from django.core.urlresolvers import reverse %>
+
 <%block name="title">Sign up</%block>
 <%block name="bodyclass">no-header</%block>
 
@@ -82,7 +84,7 @@
         submit_data,
         function(json) {
           if(json.success) {
-            $('#register').html(json.value);
+            location.href = "${reverse('index')}";
           } else {
             $('#register_error').html(json.value).stop().slideDown(150);
           }