diff --git a/static/styles/portico.css b/static/styles/portico.css
index 3642309faa..a5d1ae0d76 100644
--- a/static/styles/portico.css
+++ b/static/styles/portico.css
@@ -776,12 +776,20 @@ a.bottom-signup-button {
     margin-top: 0px;
     margin-bottom: 0px;
     padding: 8px;
-    color: #fff;
     font-size: 18px;
-    background-color: #428bca;
-    border-color: #357ebd;
     border-radius: 5px;
     min-width: 300px;
+    color: #fff;
+}
+
+.btn-user {
+    background-color: #428bca;
+    border-color: #357ebd;
+}
+
+.btn-admin {
+    background-color: #ff4136;
+    border-color: #bd7e35;
 }
 
 .feature-page-header {
diff --git a/templates/zerver/login.html b/templates/zerver/login.html
index 733f8f8048..f96afb8dc3 100644
--- a/templates/zerver/login.html
+++ b/templates/zerver/login.html
@@ -107,8 +107,11 @@ autofocus('#id_username');
 	        <label for="direct_email" class="direct-label">or Choose a user:</label>
 		{% endif %}
 	        <div class="controls">
+		    {% for user_email in direct_admins %}
+		    <p><input type="submit" name="direct_email" class="btn-direct btn-admin" value="{{ user_email }}" /></p>
+		    {% endfor %}
 		    {% for user_email in direct_users %}
-		    <p><input type="submit" name="direct_email" class="btn-direct" value="{{ user_email }}" /></p>
+		    <p><input type="submit" name="direct_email" class="btn-direct btn-user" value="{{ user_email }}" /></p>
 		    {% endfor %}
 	        </div>
 	    </div>
diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py
index 6ff7422e1f..d3c0a420d0 100644
--- a/zerver/views/__init__.py
+++ b/zerver/views/__init__.py
@@ -788,7 +788,9 @@ def finish_google_oauth2(request):
 def login_page(request, **kwargs):
     extra_context = kwargs.pop('extra_context',{})
     if dev_auth_enabled():
-        extra_context['direct_users'] = sorted([u.email for u in UserProfile.objects.filter(is_bot=False, is_active=True)])
+        users = UserProfile.objects.filter(is_bot=False, is_active=True)
+        extra_context['direct_admins'] = sorted([u.email for u in users if u.is_admin()])
+        extra_context['direct_users'] = sorted([u.email for u in users if not u.is_admin()])
     template_response = django_login_page(
         request, authentication_form=OurAuthenticationForm,
         extra_context=extra_context, **kwargs)