diff --git a/src/Entity/UserSystem/User.php b/src/Entity/UserSystem/User.php
index 66a6218c..926fc8b4 100644
--- a/src/Entity/UserSystem/User.php
+++ b/src/Entity/UserSystem/User.php
@@ -513,7 +513,7 @@ class User extends AttachmentContainingDBElement implements UserInterface, HasPe
     public function getFullName(bool $including_username = false): string
     {
         if ($including_username) {
-            return sprintf('%s %s (%s)', $this->getFirstName(), $this->getLastName(), $this->getName());
+            return sprintf('%s %s (@%s)', $this->getFirstName(), $this->getLastName(), $this->getName());
         }
 
         return sprintf('%s %s', $this->getFirstName(), $this->getLastName());
diff --git a/templates/_navbar.html.twig b/templates/_navbar.html.twig
index 3d8e8b0c..83d78e9b 100644
--- a/templates/_navbar.html.twig
+++ b/templates/_navbar.html.twig
@@ -33,7 +33,7 @@
                     {% if app.user %}<i class="fa fa-user" aria-hidden="true"></i>{% else %}<i class="far fa-user" aria-hidden="true"></i>{% endif %} <span class="caret"></span></a>
                 <ul class="dropdown-menu dropdown-menu-right" id="login-menu">
                     {% if app.user %}
-                        <a class="dropdown-item disabled" href="#" >{% trans %}user.loggedin.label{% endtrans %} {{ app.user.firstName }} {{app.user.lastName}} ({{app.user.name}})</a>
+                        <a class="dropdown-item disabled" href="#" >{% trans %}user.loggedin.label{% endtrans %} <b>{{ app.user.firstName }} {{app.user.lastName}}</b> (@{{app.user.name}})</a>
                         <a class="dropdown-item" href="{{ path("user_settings") }}"><i class="fa fa-cogs fa-fw" aria-hidden="true"></i> {% trans %}user.settings.label{% endtrans %}</a>
                         <a class="dropdown-item" href="{{ path("user_info_self") }}"><i class="fa fa-info-circle fa-fw" aria-hidden="true"></i> {% trans %}user.info.label{% endtrans %}</a>
                         <li role="separator" class="dropdown-divider"></li>
diff --git a/tests/Entity/UserSystem/UserTest.php b/tests/Entity/UserSystem/UserTest.php
index 5e7c432d..be076d82 100644
--- a/tests/Entity/UserSystem/UserTest.php
+++ b/tests/Entity/UserSystem/UserTest.php
@@ -39,7 +39,7 @@ class UserTest extends TestCase
         $user->setLastName('Doe');
 
         $this->assertSame('John Doe', $user->getFullName(false));
-        $this->assertSame('John Doe (username)', $user->getFullName(true));
+        $this->assertSame('John Doe (@username)', $user->getFullName(true));
     }
 
     public function googleAuthenticatorEnabledDataProvider(): array