diff --git a/cms/static/cms/js/build.js b/cms/static/cms/js/build.js
index a88009f2b3..d0221be3a9 100644
--- a/cms/static/cms/js/build.js
+++ b/cms/static/cms/js/build.js
@@ -28,7 +28,7 @@
             'js/certificates/factories/certificates_page_factory',
             'js/factories/index',
             'js/factories/library',
-            'js/factories/login',
+            'js/pages/login',
             'js/factories/manage_users',
             'js/factories/outline',
             'js/factories/register',
diff --git a/cms/static/js/factories/login.js b/cms/static/js/factories/login.js
index 7d080cdb2b..fdbcef31e8 100644
--- a/cms/static/js/factories/login.js
+++ b/cms/static/js/factories/login.js
@@ -1,6 +1,6 @@
 define(['jquery.cookie', 'utility', 'common/js/components/utils/view_utils'], function(cookie, utility, ViewUtils) {
     'use strict';
-    return function(homepageURL) {
+    return function LoginFactory(homepageURL) {
         function postJSON(url, data, callback) {
             $.ajax({
                 type: 'POST',
diff --git a/cms/static/js/pages/login.js b/cms/static/js/pages/login.js
new file mode 100644
index 0000000000..8c53644675
--- /dev/null
+++ b/cms/static/js/pages/login.js
@@ -0,0 +1,11 @@
+(function(define) {
+    'use strict';
+
+    define(
+        ['js/factories/login', 'common/js/utils/page_factory'],
+        function(LoginFactory, invokePageFactory) {
+            invokePageFactory('LoginFactory', LoginFactory);
+        }
+    );
+}).call(this, define || RequireJS.define);
+
diff --git a/cms/templates/login.html b/cms/templates/login.html
index 205e64f3cd..91b54b5c74 100644
--- a/cms/templates/login.html
+++ b/cms/templates/login.html
@@ -54,8 +54,9 @@ from openedx.core.djangolib.js_utils import js_escaped_string
 </div>
 </%block>
 
-<%block name="requirejs">
-  require(["js/factories/login"], function(LoginFactory) {
-      LoginFactory("${reverse('homepage') | n, js_escaped_string}");
-  });
+<%block name="requirejs_page">
+  <%static:require_page page_name="js/pages/login" class_name="LoginFactory">
+    ## xss-lint: disable=mako-invalid-js-filter, mako-invalid-html-filter
+    "${reverse('homepage') | n, js_escaped_string}"
+  </%static:require_page>
 </%block>
diff --git a/common/test/test-theme/cms/templates/login.html b/common/test/test-theme/cms/templates/login.html
index a5faf86f1c..95ba9e9795 100644
--- a/common/test/test-theme/cms/templates/login.html
+++ b/common/test/test-theme/cms/templates/login.html
@@ -1,3 +1,4 @@
+<%namespace name='static' file='/static_content.html'/>
 <%page expression_filter="h"/>
 
 <%inherit file="base.html" />
@@ -51,8 +52,9 @@ from openedx.core.djangolib.js_utils import js_escaped_string
 </div>
 </%block>
 
-<%block name="requirejs">
-  require(["js/factories/login"], function(LoginFactory) {
-      LoginFactory("${reverse('homepage') | n, js_escaped_string }");
-  });
+<%block name="requirejs_page">
+  <%static:require_page page_name="js/pages/login" class_name="LoginFactory">
+    ## xss-lint: disable=mako-invalid-js-filter, mako-invalid-html-filter
+    "${reverse('homepage') | n, js_escaped_string}"
+  </%static:require_page>
 </%block>
diff --git a/themes/red-theme/cms/templates/login.html b/themes/red-theme/cms/templates/login.html
index 8f9274f7a4..ae55043263 100644
--- a/themes/red-theme/cms/templates/login.html
+++ b/themes/red-theme/cms/templates/login.html
@@ -1,3 +1,4 @@
+<%namespace name='static' file='/static_content.html'/>
 <%page expression_filter="h"/>
 
 <%inherit file="base.html" />
@@ -50,8 +51,9 @@ from django.utils.translation import ugettext as _
 </div>
 </%block>
 
-<%block name="requirejs">
-  require(["js/factories/login"], function(LoginFactory) {
-      LoginFactory("${reverse('homepage')}");
-  });
+<%block name="requirejs_page">
+  <%static:require_page page_name="js/pages/login" class_name="LoginFactory">
+    ## xss-lint: disable=mako-invalid-js-filter, mako-invalid-html-filter
+    "${reverse('homepage') | n, js_escaped_string}"
+  </%static:require_page>
 </%block>