diff --git a/wizard/templates/wizard/whoami.html b/wizard/templates/wizard/whoami.html
index 3c3935b525d833739d3eea6101684de122cb16b5..05eb78f8d9fdacd9729df3260c17dba74a1bc468 100644
--- a/wizard/templates/wizard/whoami.html
+++ b/wizard/templates/wizard/whoami.html
@@ -2,25 +2,50 @@
 
 <div class="card">
   <div class="card-body">
-  {% if request.sso_username %}
+  {% if request.signon_identities %}
     {% if visitor %}
-{% blocktrans with request_user_username=request.user.username visitor_a_link=visitor.a_link %}You
-are currently logged in with
-<a href="https://wiki.debian.org/DebianSingleSignOn">SSO username</a>
-<b>{{request_user_username}}</b>, and recognized as {{visitor_a_link}}.{% endblocktrans %}
+
+{% blocktrans with visitor_a_link=visitor.a_link %}
+You are currently logged in, and recognized as {{visitor_a_link}}.
+{% endblocktrans %}
+
     {% else %}
+
 {% url 'dm_claim' as dm_claim_url %}
 {% blocktrans with request_user_username=request.user.username %}You
-are currently logged in with
-<a href="https://wiki.debian.org/DebianSingleSignOn">SSO username</a>
-<b>{{request_user_username}}</b>, but not mapped to any person in the site.
+are currently logged in, but not mapped to any person in the site.
 If you are a Debian Maintainer, you can try to correct the situation using the
 <a href="{{dm_claim}}">claim interface</a>.{% endblocktrans %}
+
+<p>{% trans "You are logged in as:" %}</p>
+
+<ul>
+{% for identity in request.signon_identities.values %}
+<li>
+  {% with identity.get_provider as provider %}
+    {% if identity.picture %}
+    <img class="personpic ml-auto" src="{{identity.picture}}"></img>
+    {% elif provider.icon %}
+    <img style="vertical-align: text-top; height: 1em" class="mr-2" src="{{STATIC_URL}}{{provider.icon}}"></img>
+    {% else %}
+    <span class="mr-2 fa fa-sign-in"></span>
     {% endif %}
+
+    {% if identity.profile %}<a href="{{identity.profile}}">{% endif %}
+      {{provider.label}}:
+      {{identity.fullname}}{% if identity.username %} &lt;{{identity.username}}&gt;{% endif %}
+    {% if identity.profile %}</a>{% endif %}
+  {% endwith %}
+</li>
+{% endfor %}
+</ul>
+  {% endif %}
+
   {% else %}
 {% blocktrans %}You are not currently logged in. See the
 <a href="https://wiki.debian.org/DebianSingleSignOn">Single Sign-On page</a>
 for details.{% endblocktrans %}
+
   {% endif %}
   </div>
 </div>
diff --git a/wizard/tests/test_advocate.py b/wizard/tests/test_advocate.py
index d76133a54ef3c29c5b18faebdb1f2d43ba1c8f44..a24e3b33418064d56843b65806d7a64b9895dea2 100644
--- a/wizard/tests/test_advocate.py
+++ b/wizard/tests/test_advocate.py
@@ -5,7 +5,7 @@ from backend import const
 from backend.unittest import PersonFixtureMixin
 
 
-class PersonPageTestCase(PersonFixtureMixin, TestCase):
+class AdvocateTests(PersonFixtureMixin, TestCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
diff --git a/wizard/tests/test_whoami.py b/wizard/tests/test_whoami.py
new file mode 100644
index 0000000000000000000000000000000000000000..eb263fca3efe155d2de969824374e25605155270
--- /dev/null
+++ b/wizard/tests/test_whoami.py
@@ -0,0 +1,42 @@
+from __future__ import annotations
+from django.test import TestCase
+from django.urls import reverse
+from backend import const
+from backend.unittest import PersonFixtureMixin
+from signon.models import Identity
+
+
+class WhoamiTests(PersonFixtureMixin, TestCase):
+    def test_notlogged(self):
+        # Check that the new person is listed on the page
+        client = self.make_test_client(None)
+        response = client.get(reverse('wizard_home'))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "You are not currently logged in.")
+        self.assertNotContains(response, "but not mapped to any person in the site.")
+        self.assertNotContains(response, "You are currently logged in, and recognized as")
+
+    def test_active_unbound(self):
+        # Check that the new person is listed on the page
+        identity = Identity.objects.create(
+                issuer="debsso", subject="test@debian.org",
+                username="test@debian.org", audit_skip=True)
+        client = self.make_test_client(None, [identity])
+        response = client.get(reverse('wizard_home'))
+        self.assertEqual(response.status_code, 200)
+        self.assertNotContains(response, "You are not currently logged in.")
+        self.assertContains(response, "but not mapped to any person in the site.")
+        self.assertNotContains(response, "You are currently logged in, and recognized as")
+
+    def test_active_bound(self):
+        # Check that the new person is listed on the page
+        identity = Identity.objects.create(
+                person=self.persons.dc,
+                issuer="debsso", subject="test@debian.org",
+                username="test@debian.org", audit_skip=True)
+        client = self.make_test_client(self.persons.dc, [identity])
+        response = client.get(reverse('wizard_home'))
+        self.assertEqual(response.status_code, 200)
+        self.assertNotContains(response, "You are not currently logged in.")
+        self.assertNotContains(response, "but not mapped to any person in the site.")
+        self.assertContains(response, "You are currently logged in, and recognized as")