diff --git a/ArmaforcesMissionBot/Modules/Signups.cs b/ArmaforcesMissionBot/Modules/Signups.cs
index 3941972..14ce4f6 100644
--- a/ArmaforcesMissionBot/Modules/Signups.cs
+++ b/ArmaforcesMissionBot/Modules/Signups.cs
@@ -242,9 +242,10 @@ public async Task AddTeam([Remainder]string teamText)
                                 slot.Name = match.Groups[3].Value;
                                 foreach(var user in Context.Message.MentionedUsers)
                                 {
+                                    slot.Name = slot.Name.Replace("<@", "<@!");
                                     if(slot.Name.Contains(user.Mention))
                                     {
-                                        slot.Name = slot.Name.Replace(user.Mention, "");
+                                        slot.Name = slot.Name.Replace(user.Mention, "").TrimEnd();
                                         slot.Signed.Add(user.Id);
                                     }
                                 }