diff --git a/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html b/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html
index 33735010..bcc54610 100644
--- a/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html
+++ b/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html
@@ -10,12 +10,14 @@
 {% endblock %}
 
 {% block user %}
-    {% translate "Username" %}: {{ char.character_name }}
+    {% include "services/service_username.html" with username=char.character_name %}
 {% endblock %}
 
-{#{% block active %}#}
-{#    {% include "services/service_status.html" with username=char.character_name %}#}
-{#{% endblock %}#}
+{% block active %}
+    <span class="badge bg-success">
+        {% translate "SSO login active" %}
+    </span>
+{% endblock %}
 
 {% block controls %}
     <a class="btn btn-success" href="{{ DISCOURSE_URL }}" title="{% translate 'Go to forums' %}">
diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html
index e2e26379..d4b589e1 100644
--- a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html
+++ b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html
@@ -11,9 +11,7 @@
 {% endblock %}
 
 {% block user %}
-    {% if username %}
-        {% translate "Username" %}: {{ username }}
-    {% endif %}
+    {% include "services/service_username.html" with username=username %}
 {% endblock %}
 
 {% block controls %}
diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html
index 2eca785a..4fafbead 100644
--- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html
+++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html
@@ -14,7 +14,7 @@
 {% endblock %}
 
 {% block user %}
-    {{ authinfo.teamspeak3_uid }}
+    {% include "services/service_username.html" with username=authinfo.teamspeak3_uid %}
 {% endblock %}
 
 {% block controls %}
diff --git a/allianceauth/services/templates/services/service_username.html b/allianceauth/services/templates/services/service_username.html
new file mode 100644
index 00000000..8d7e4542
--- /dev/null
+++ b/allianceauth/services/templates/services/service_username.html
@@ -0,0 +1,5 @@
+{% load i18n %}
+
+{% if username != '' %}
+    {% translate "Username" %}: {{ username }}
+{% endif %}
diff --git a/allianceauth/services/templates/services/services_ctrl_base.html b/allianceauth/services/templates/services/services_ctrl_base.html
index e8423c41..ba20fdff 100644
--- a/allianceauth/services/templates/services/services_ctrl_base.html
+++ b/allianceauth/services/templates/services/services_ctrl_base.html
@@ -1,15 +1,29 @@
 {% load i18n %}
+
 <div class="card text-center m-4" style="min-width: 18rem; min-height: 18rem">
     <div class="card-body">
         <h5 class="card-title">{% block title %}{% endblock title %}</h5>
+
         <p class="card-text">
             {% block active %}
                 {% include "services/service_status.html" with username=username %}
             {% endblock active %}
         </p>
-        <p class="card-text">{% block url %}{% endblock url %}</p>
-        <p class="card-text">{% block user %}{% endblock user %}</p>
+
+        <p class="card-text">
+            {% block url %}{% endblock url %}
+        </p>
+
+        <p class="card-text">
+            {% block user %}
+                {% include "services/service_username.html" with username=username %}
+            {% endblock user %}
+        </p>
+
         {% block extra %}{% endblock extra %}
     </div>
-    <div class="card-footer">{% block controls %}{% endblock controls %}</div>
+
+    <div class="card-footer">
+        {% block controls %}{% endblock controls %}
+    </div>
 </div>