diff --git a/src/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs b/src/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs
index e13a278f..160004d8 100644
--- a/src/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs
+++ b/src/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs
@@ -108,7 +108,6 @@ namespace NadekoBot.Modules.Administration
                 using (var uow = DbHandler.UnitOfWork())
                 {
                     var roleModels = uow.SelfAssignedRoles.GetFromGuild(Context.Guild.Id).ToList();
-                    roleCnt = roleModels.Count;
                     msg.AppendLine();
                     
                     foreach (var roleModel in roleModels)
@@ -116,11 +115,13 @@ namespace NadekoBot.Modules.Administration
                         var role = Context.Guild.Roles.FirstOrDefault(r => r.Id == roleModel.RoleId);
                         if (role == null)
                         {
+                            toRemove.Add(roleModel);
                             uow.SelfAssignedRoles.Remove(roleModel);
                         }
                         else
                         {
                             msg.Append($"**{role.Name}**, ");
+                            roleCnt++;
                         }
                     }
                     foreach (var role in toRemove)
diff --git a/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs b/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs
index bffa5624..640422f7 100644
--- a/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs
+++ b/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs
@@ -82,9 +82,9 @@ namespace NadekoBot.Modules.Games
                                 var prefix = NadekoBot.ModulePrefixes[typeof(Games).Name];
                                 var toSend = dropAmount == 1 
                                     ? GetLocalText(channel, "curgen_sn", NadekoBot.BotConfig.CurrencySign) 
-                                        + GetLocalText(channel, "pick_sn", prefix)
+                                        + " " + GetLocalText(channel, "pick_sn", prefix)
                                     : GetLocalText(channel, "curgen_pl", dropAmount, NadekoBot.BotConfig.CurrencySign)
-                                        + GetLocalText(channel, "pick_pl", prefix);
+                                        + " " + GetLocalText(channel, "pick_pl", prefix);
                                 var file = GetRandomCurrencyImage();
                                 using (var fileStream = file.Value.ToStream())
                                 {