diff --git a/AUTHORS b/AUTHORS
index b3e49f38bb..df0628bc2c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -274,3 +274,4 @@ Sofiya Semenova <ssemenova@edx.org>
 Alisan Tang <atang@edx.org>
 Kevin Kim <kkim@edx.org>
 Albert St. Aubin Jr. <astaubin@edx.org>
+Casey Litton <caseylitton@gmail.com>
diff --git a/lms/djangoapps/student_account/views.py b/lms/djangoapps/student_account/views.py
index 758e5bbc77..959f51becb 100644
--- a/lms/djangoapps/student_account/views.py
+++ b/lms/djangoapps/student_account/views.py
@@ -122,7 +122,10 @@ def login_and_registration_form(request, initial_mode="login"):
         'responsive': True,
         'allow_iframing': True,
         'disable_courseware_js': True,
-        'disable_footer': True,
+        'disable_footer': not get_themed_value(
+            'ENABLE_COMBINED_LOGIN_REGISTRATION_FOOTER',
+            settings.FEATURES['ENABLE_COMBINED_LOGIN_REGISTRATION_FOOTER']
+        ),
     }
 
     return render_to_response('student_account/login_and_register.html', context)
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 378c43a7a9..662f27154a 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -262,6 +262,7 @@ FEATURES = {
 
     # Enable the combined login/registration form
     'ENABLE_COMBINED_LOGIN_REGISTRATION': False,
+    'ENABLE_COMBINED_LOGIN_REGISTRATION_FOOTER': False,
 
     # Enable organizational email opt-in
     'ENABLE_MKTG_EMAIL_OPT_IN': False,