diff --git a/Content.Client/Administration/UI/BanList/BanListControl.xaml.cs b/Content.Client/Administration/UI/BanList/BanListControl.xaml.cs
index d9a892ffad..5846179fb5 100644
--- a/Content.Client/Administration/UI/BanList/BanListControl.xaml.cs
+++ b/Content.Client/Administration/UI/BanList/BanListControl.xaml.cs
@@ -46,13 +46,16 @@ public sealed partial class BanListControl : Control
ClosePopup();
var ban = line.Ban;
+ var id = ban.Id == null ? string.Empty : Loc.GetString("ban-list-id", ("id", ban.Id.Value));
var ip = ban.Address == null
? string.Empty
: Loc.GetString("ban-list-ip", ("ip", ban.Address.Value.address));
- var hwid = ban.HWId == null ? string.Empty : Loc.GetString("ban-list-hwid", ("hwid", ban.HWId));
- var guid = ban.UserId == null ? string.Empty : Loc.GetString("ban-list-guid", ("guid", ban.UserId.Value.ToString()));
+ var hwid = ban.HWId == null ? string.Empty : Loc.GetString("ban-list-hwid", ("hwid", ban.HWId));
+ var guid = ban.UserId == null
+ ? string.Empty
+ : Loc.GetString("ban-list-guid", ("guid", ban.UserId.Value.ToString()));
- _popup = new BanListIdsPopup(ip, hwid, guid);
+ _popup = new BanListIdsPopup(id, ip, hwid, guid);
var box = UIBox2.FromDimensions(UserInterfaceManager.MousePositionScaled.Position, (1, 1));
_popup.Open(box);
diff --git a/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml b/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml
index dbd58b8c27..ae8c99bc75 100644
--- a/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml
+++ b/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml
@@ -5,6 +5,7 @@
+
diff --git a/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml.cs b/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml.cs
index 6fb2257e97..772f644b2e 100644
--- a/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml.cs
+++ b/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml.cs
@@ -7,10 +7,11 @@ namespace Content.Client.Administration.UI.BanList;
[GenerateTypedNameReferences]
public sealed partial class BanListIdsPopup : Popup
{
- public BanListIdsPopup(string? ip, string? hwid, string? guid)
+ public BanListIdsPopup(string? id, string? ip, string? hwid, string? guid)
{
RobustXamlLoader.Load(this);
+ ID.Text = id;
IP.Text = ip;
HWId.Text = hwid;
GUID.Text = guid;
diff --git a/Content.Client/Administration/UI/BanList/BanListLine.xaml b/Content.Client/Administration/UI/BanList/BanListLine.xaml
index 8d324f12b6..111588e61d 100644
--- a/Content.Client/Administration/UI/BanList/BanListLine.xaml
+++ b/Content.Client/Administration/UI/BanList/BanListLine.xaml
@@ -8,11 +8,11 @@
SizeFlagsStretchRatio="1"
HorizontalExpand="True"
RectClipContent="True">
-
+