diff --git a/app/views/projects/commit/_valid_signature_badge.html.haml b/app/views/projects/commit/_valid_signature_badge.html.haml
index 5a451cb4055f251ac8e7ec04a2bd5168d59b14b5..db1a41bbf64bb8652ef30e6248aa773db3ca3101 100644
--- a/app/views/projects/commit/_valid_signature_badge.html.haml
+++ b/app/views/projects/commit/_valid_signature_badge.html.haml
@@ -16,8 +16,8 @@
         = user_avatar_without_link(user: user, size: 32)
 
       %div
-        %strong= gpg_key.user.username
-        %div= gpg_key.user.name
+        %strong= gpg_key.user.name
+        %div @#{gpg_key.user.username}
   - else
     = mail_to user_email do
       %div
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index b6b0cc7e1d3367942d04122c45f32cd29acde213..9bd4b478cce9c7976a250b4cfa684b4d42785f0b 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -285,8 +285,8 @@ describe 'Commits' do
       click_on 'Verified'
       within '.popover' do
         expect(page).to have_content 'This commit was signed with a verified signature.'
-        expect(page).to have_content 'nannie.bernhard'
         expect(page).to have_content 'Nannie Bernhard'
+        expect(page).to have_content '@nannie.bernhard'
         expect(page).to have_content "GPG Key ID: #{GpgHelpers::User1.primary_keyid}"
       end