diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index b3bb134e3d..926fd05d68 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -59,6 +59,7 @@ from cms.djangoapps.models.settings.course_details import CourseDetails,\
 from cms.djangoapps.models.settings.course_grading import CourseGradingModel
 from cms.djangoapps.contentstore.utils import get_modulestore
 from lxml import etree
+from django.shortcuts import redirect
 
 # to install PIL on MacOSX: 'easy_install http://dist.repoze.org/PIL-1.1.6.tar.gz'
 
@@ -81,6 +82,11 @@ def signup(request):
     csrf_token = csrf(request)['csrf_token']
     return render_to_response('signup.html', {'csrf': csrf_token})
 
+def old_login_redirect(request):
+    '''
+    Redirect to the active login url.
+    '''
+    return redirect('login', permanent=True)
 
 @ssl_login_shortcut
 @ensure_csrf_cookie
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 30aac6ea01..281dd97f20 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -74,8 +74,8 @@ TEMPLATE_DIRS = MAKO_TEMPLATES['main']
 
 MITX_ROOT_URL = ''
 
-LOGIN_REDIRECT_URL = MITX_ROOT_URL + '/login'
-LOGIN_URL = MITX_ROOT_URL + '/login'
+LOGIN_REDIRECT_URL = MITX_ROOT_URL + '/signin'
+LOGIN_URL = MITX_ROOT_URL + '/signin'
 
 
 TEMPLATE_CONTEXT_PROCESSORS = (
diff --git a/cms/templates/activation_active.html b/cms/templates/activation_active.html
index 07d3a37969..712c73abf9 100644
--- a/cms/templates/activation_active.html
+++ b/cms/templates/activation_active.html
@@ -7,7 +7,7 @@
 
 <section class="activation">
   <h1>Account already active!</h1>
-  <p> This account has already been activated. <a href="/login">Log in here</a>.</p>
+  <p> This account has already been activated. <a href="/signin">Log in here</a>.</p>
 </div>
 </section>
 
diff --git a/cms/templates/activation_complete.html b/cms/templates/activation_complete.html
index 5d9437ccb3..1e195a632c 100644
--- a/cms/templates/activation_complete.html
+++ b/cms/templates/activation_complete.html
@@ -5,7 +5,7 @@
 <section class="tos">
 <div>
   <h1>Activation Complete!</h1>
-  <p>Thanks for activating your account. <a href="/login">Log in here</a>.</p>
+  <p>Thanks for activating your account. <a href="/signin">Log in here</a>.</p>
 </div>
 </section>
 
diff --git a/cms/urls.py b/cms/urls.py
index a41094c780..35b2707241 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -85,7 +85,8 @@ urlpatterns += (
     url(r'^activate/(?P<key>[^/]*)$', 'student.views.activate_account', name='activate'),
 
     # form page
-    url(r'^login$', 'contentstore.views.login_page', name='login'),
+    url(r'^login$', 'contentstore.views.old_login_redirect', name='old_login'),
+    url(r'^signin$', 'contentstore.views.login_page', name='login'),
     # ajax view that actually does the work
     url(r'^login_post$', 'student.views.login_user', name='login_post'),