diff --git a/lms/envs/common.py b/lms/envs/common.py
index d17299ac0a..b0c3ae5726 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1582,7 +1582,7 @@ MKTG_URL_LINK_MAP = {
     'COURSES': 'courses',
     'ROOT': 'root',
     'TOS': 'tos',
-    'HONOR': 'honor',
+    'HONOR': 'honor',  # If your site does not have an honor code, simply delete this line.
     'PRIVACY': 'privacy',
     'PRESS': 'press',
     'BLOG': 'blog',
diff --git a/lms/templates/register.html b/lms/templates/register.html
index f614ad002a..299f9fd227 100644
--- a/lms/templates/register.html
+++ b/lms/templates/register.html
@@ -339,6 +339,8 @@
             % endif
 
             % if settings.REGISTRATION_EXTRA_FIELDS['honor_code'] != 'hidden':
+	    ## If the stanford theme isn't enabled, check if we have an Honor Code link in our marketing map
+	    % if not self.stanford_theme_enabled() and marketing_link('HONOR') and marketing_link('HONOR') != '#':
             <div class="field ${settings.REGISTRATION_EXTRA_FIELDS['honor_code']} checkbox" id="field-honorcode">
               <input id="honorcode-yes" type="checkbox" name="honor_code" value="true" />
               <%
@@ -352,6 +354,7 @@
                 link_start='<a href="{url}" class="new-vp" tabindex="-1">'.format(url=honor_code_path),
                 link_end='</a>')}</label>
             </div>
+	    % endif
             % endif
           </li>
         </ol>