diff --git a/eveonline/views.py b/eveonline/views.py
index 6115e77b..a71b43ec 100755
--- a/eveonline/views.py
+++ b/eveonline/views.py
@@ -118,8 +118,7 @@ def dashboard_view(request):
         for api in apikeypairs:
             api_chars.append({
                 'id': api.api_id,
-                'sso_verified': api.sso_verified,
-                'is_valid': api.sso_verified if sso_validation else True,
+                'sso_verified': api.sso_verified if sso_validation else True,
                 'characters': EveManager.get_characters_by_api_id(api.api_id),
             })
 
diff --git a/stock/templates/registered/dashboard.html b/stock/templates/registered/dashboard.html
index c2343fc5..d405cc74 100644
--- a/stock/templates/registered/dashboard.html
+++ b/stock/templates/registered/dashboard.html
@@ -68,10 +68,10 @@
                 <div class="clearfix"></div>
                 {% if apis %}
                     {% for api in apis %}
-                        <div class="panel panel-{{ api.is_valid|yesno:"success,danger,default" }}">
+                        <div class="panel panel-{{ api.sso_verified|yesno:"success,warning,default" }}">
                             <div class="panel-heading" style="display:flex;">
-                                <div style="width: 25%;">
-                                    {% trans "API ID" %} {{ api.id }} <span class="glyphicon glyphicon-{{ api.is_valid|yesno:"ok-sign,minus-sign,question-sign" }}"></span>
+                                <div style="width: 25%;" title="{% if not api.sso_verified and api_sso_validation %}{% trans "API Key requires EVE SSO verification" %}{% else %}{% trans "API Key is valid" %}{% endif %}">
+                                    {% trans "API ID" %} {{ api.id }} <span class="glyphicon glyphicon-{{ api.sso_verified|yesno:"ok-sign,warning-sign,question-sign" }}"></span>
                                 </div>
                                 <div class="text-right" style="width: 75%;">
                                     <a href="{% url 'auth_user_refresh_api' api.id %}" class="btn btn-primary" title="Update"><span class="glyphicon glyphicon-refresh"></span></a>