diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index d5b7ae0893..b8c8f5e912 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -420,7 +420,7 @@ def university_profile(request, org_id):
     Return the profile for the particular org_id.  404 if it's not valid.
     """
     all_courses = modulestore().get_courses()
-    valid_org_ids = set(c.org for c in all_courses)
+    valid_org_ids = set(c.org for c in all_courses).union(settings.VIRTUAL_UNIVERSITIES)
     if org_id not in valid_org_ids:
         raise Http404("University Profile not found for {0}".format(org_id))
 
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 8794cb0581..eb8533395e 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -58,6 +58,7 @@ LOGGING = get_logger_config(LOG_DIR,
 
 COURSE_LISTINGS = ENV_TOKENS.get('COURSE_LISTINGS', {})
 SUBDOMAIN_BRANDING = ENV_TOKENS.get('SUBDOMAIN_BRANDING', {})
+VIRTUAL_UNIVERSITIES = ENV_TOKENS.get('VIRTUAL_UNIVERSITIES', [])
 COMMENTS_SERVICE_URL = ENV_TOKENS.get("COMMENTS_SERVICE_URL",'')
 COMMENTS_SERVICE_KEY = ENV_TOKENS.get("COMMENTS_SERVICE_KEY",'')
 
diff --git a/lms/envs/cms/dev.py b/lms/envs/cms/dev.py
index ded3471ea2..7adaacd4d6 100644
--- a/lms/envs/cms/dev.py
+++ b/lms/envs/cms/dev.py
@@ -4,6 +4,11 @@ Settings for the LMS that runs alongside the CMS on AWS
 
 from ..dev import *
 
+MITX_FEATURES['AUTH_USE_MIT_CERTIFICATES'] = False
+
+SUBDOMAIN_BRANDING['edge'] = 'edge'
+VIRTUAL_UNIVERSITIES = ['edge']
+
 modulestore_options = {
     'default_class': 'xmodule.raw_module.RawDescriptor',
     'host': 'localhost',
@@ -24,6 +29,6 @@ CONTENTSTORE = {
     'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore',
     'OPTIONS': {
         'host': 'localhost',
-        'db' : 'xcontent',
+        'db': 'xcontent',
     }
 }
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index b89b0246f3..1cc9ee4b88 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -101,6 +101,10 @@ SUBDOMAIN_BRANDING = {
     'harvard': 'HarvardX',
 }
 
+# List of `university` landing pages to display, even though they may not
+# have an actual course with that org set
+VIRTUAL_UNIVERSITIES = []
+
 COMMENTS_SERVICE_KEY = "PUT_YOUR_API_KEY_HERE"
 
 
diff --git a/lms/templates/university_profile/edge.html b/lms/templates/university_profile/edge.html
index c8f0b69242..f665ad31d0 100644
--- a/lms/templates/university_profile/edge.html
+++ b/lms/templates/university_profile/edge.html
@@ -1,5 +1,4 @@
 <%inherit file="base.html" />
-<%! from django.core.urlresolvers import reverse %>
 <%block name="title">edX edge</%block>
 <%block name="bodyclass">no-header edge-landing</%block>