diff --git a/endpoints/common.py b/endpoints/common.py
index 287d7cc49..ad4e40a19 100644
--- a/endpoints/common.py
+++ b/endpoints/common.py
@@ -205,6 +205,7 @@ def render_page_template(name, route_data=None, **kwargs):
                                        oauth_set=json.dumps(get_oauth_config()),
                                        scope_set=json.dumps(scopes.app_scopes(app.config)),
                                        vuln_priority_set=json.dumps(PRIORITY_LEVELS),
+                                       enterprise_logo=app.config.get('ENTERPRISE_LOGO_URL', ''),
                                        mixpanel_key=app.config.get('MIXPANEL_KEY', ''),
                                        google_tagmanager_key=app.config.get('GOOGLE_TAGMANAGER_KEY', ''),
                                        sentry_public_dsn=app.config.get('SENTRY_PUBLIC_DSN', ''),
diff --git a/templates/500.html b/templates/500.html
index 2e3ea4b08..28f81baa6 100644
--- a/templates/500.html
+++ b/templates/500.html
@@ -11,6 +11,7 @@
     <p>If the issue persists and is blocking you from getting stuff done, <a href="/contact">contact us</a>.</p>
   </h4>
 
+  {% if has_billing %}
   <div style="margin-top: 20px">
     Current Service Status:
     <span id="status-elem">(Loading)</span>
@@ -23,4 +24,5 @@
       renderTo: '#status-elem'
     });
   </script>
+  {% endif %}
 {% endblock %}
diff --git a/templates/error.html b/templates/error.html
index 21560cdbc..3bc28ffbb 100644
--- a/templates/error.html
+++ b/templates/error.html
@@ -83,7 +83,7 @@
       <div class="water layer"></div>
     </div>
     <div class="information">
-      <img src="/static/img/Quay_horizontal_color.svg" style="max-height: 50px;">
+      <img src="{{ enterprise_logo or '/static/img/Quay_horizontal_color.svg' }}" style="max-height: 50px;">
       {% block content %}
 
       {% endblock %}