diff --git a/lms/envs/common.py b/lms/envs/common.py
index 487e2efe48..9289517be7 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -55,6 +55,8 @@ MITX_FEATURES = {
     'ENABLE_SQL_TRACKING_LOGS': False,
     'ENABLE_LMS_MIGRATION': False,
 
+    'DISABLE_LOGIN_BUTTON': False,	# used in systems where login is automatic, eg MIT SSL
+
     # extrernal access methods
     'ACCESS_REQUIRE_STAFF_FOR_COURSE': False,
     'AUTH_USE_OPENID': False,
diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index d8b61572a5..91adfbf605 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -10,12 +10,17 @@ sessions. Assumes structure:
 from .common import *
 from .logsettings import get_logger_config
 from .dev import *
+import socket
 
 WIKI_ENABLED = False
 MITX_FEATURES['ENABLE_TEXTBOOK'] = False
 MITX_FEATURES['ENABLE_DISCUSSION'] = False
 MITX_FEATURES['ACCESS_REQUIRE_STAFF_FOR_COURSE'] = True	  # require that user be in the staff_* group to be able to enroll
 
+myhost = socket.gethostname()
+if ('edxvm' in myhost) or ('ocw' in myhost):
+    MITX_FEATURES['DISABLE_LOGIN_BUTTON'] = True	# auto-login with MIT certificate
+
 #-----------------------------------------------------------------------------
 # disable django debug toolbars
 
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index 7ba5cca8d0..6c4cfc853b 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -42,11 +42,15 @@
         <a href="${reverse('about_edx')}">About</a>
         <a href="http://edxonline.tumblr.com/">Blog</a>
         <a href="${reverse('jobs')}">Jobs</a>
+% if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']:
         <a href="#login-modal" id="login" rel="leanModal">Log In</a>
+% endif
       </li>
+% if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']:
       <li class="primary">
         <a href="#signup-modal" id="signup" rel="leanModal">Sign Up</a>
       </li>
+% endif
     </ol>
   </nav>
   %endif