diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go
index dae3fe1b..116bf86d 100644
--- a/bridge/discord/discord.go
+++ b/bridge/discord/discord.go
@@ -407,12 +407,11 @@ func (b *Bdiscord) replaceUserMentions(text string) string {
 		mention := strings.TrimSpace(m[1:])
 		var member *discordgo.Member
 		var err error
-		var lastSpace int
 		for {
 			b.Log.Debugf("Testing mention: '%s'", mention)
 			member, err = b.getGuildMemberByNick(mention)
 			if err != nil {
-				lastSpace = strings.LastIndex(mention, " ")
+				lastSpace := strings.LastIndex(mention, " ")
 				if lastSpace == -1 {
 					break
 				}
@@ -424,7 +423,7 @@ func (b *Bdiscord) replaceUserMentions(text string) string {
 		if err != nil {
 			return m
 		}
-		return member.User.Mention() + " " + m[lastSpace+2:]
+		return strings.Replace(m, "@"+mention, member.User.Mention(), -1)
 	})
 	b.Log.Debugf("Message with mention replaced: %s", text)
 	return text