diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs
index 3f9aa97..6ac2c75 100644
--- a/MareSynchronos/UI/CompactUI.cs
+++ b/MareSynchronos/UI/CompactUI.cs
@@ -90,7 +90,7 @@ public class CompactUi : Window, IDisposable
         _serverManager = serverManager;
         _tagHandler = new(_serverManager);
 
-        _groupPanel = new(this, uiShared, _pairManager, _serverManager);
+        _groupPanel = new(this, uiShared, _pairManager, _serverManager, _configService);
         _selectGroupForPairUi = new(_tagHandler);
         _selectPairsForGroupUi = new(_tagHandler);
         _pairGroupsUi = new(_tagHandler, DrawPairedClient, apiController, _selectPairsForGroupUi);
diff --git a/MareSynchronos/UI/GroupPanel.cs b/MareSynchronos/UI/GroupPanel.cs
index bbb148d..0514a63 100644
--- a/MareSynchronos/UI/GroupPanel.cs
+++ b/MareSynchronos/UI/GroupPanel.cs
@@ -14,6 +14,7 @@ using MareSynchronos.API.Data.Extensions;
 using MareSynchronos.Managers;
 using MareSynchronos.Models;
 using MareSynchronos.API.Data.Comparer;
+using MareSynchronos.MareConfiguration;
 
 namespace MareSynchronos.UI
 {
@@ -24,6 +25,7 @@ namespace MareSynchronos.UI
         private ApiController ApiController => _uiShared.ApiController;
         private readonly PairManager _pairManager;
         private readonly ServerConfigurationManager _serverConfigurationManager;
+        private readonly ConfigurationService _configService;
         private readonly Dictionary<string, bool> _showGidForEntry = new(StringComparer.Ordinal);
         private string _editGroupEntry = string.Empty;
         private string _editGroupComment = string.Empty;
@@ -51,12 +53,13 @@ namespace MareSynchronos.UI
         private bool _modalChangePwOpened;
         private int _bulkInviteCount = 10;
 
-        public GroupPanel(CompactUi mainUi, UiShared uiShared, PairManager pairManager, ServerConfigurationManager serverConfigurationManager)
+        public GroupPanel(CompactUi mainUi, UiShared uiShared, PairManager pairManager, ServerConfigurationManager serverConfigurationManager, ConfigurationService configurationService)
         {
             _mainUi = mainUi;
             _uiShared = uiShared;
             _pairManager = pairManager;
             _serverConfigurationManager = serverConfigurationManager;
+            _configService = configurationService;
         }
 
         public void DrawSyncshells()
@@ -833,6 +836,12 @@ namespace MareSynchronos.UI
                 playerText = entryUID;
             }
 
+            if (_configService.Current.ShowCharacterNameInsteadOfNotesForVisible && pair.IsVisible && !showUidInsteadOfName)
+            {
+                playerText = pair.PlayerName;
+                textIsUid = false;
+            }
+
             bool plusButtonShown = !_pairManager.DirectPairs.Any(p => string.Equals(p.UserData.UID, entry.UID, StringComparison.Ordinal));
 
             ImGui.SameLine();