diff --git a/irc/transport.go b/irc/transport.go
index 3fe092cc90dd2eed5c1750afd9f6bc627e1f546a..bf87f02c2eb1f12fc6e312ec479e29f4bb2dd644 100644
--- a/irc/transport.go
+++ b/irc/transport.go
@@ -137,9 +137,11 @@ func (t *Transport) getIrcClient(cfg *irc.Config) *irc.Conn {
 	return client
 }
 
-func (t *Transport) isUserDistant(user string) bool {
-	for k, _ := range t.realNicks {
-		if k == user {
+func (t *Transport) isUserDistant(ircNick string) bool {
+	nick := t.getRealNick(ircNick)
+
+	for k, _ := range t.userClients {
+		if k == nick {
 			return true
 		}
 	}
@@ -149,6 +151,10 @@ func (t *Transport) isUserDistant(user string) bool {
 
 func (t *Transport) getNick(client *irc.Conn) string {
 	ircNick := client.Me().Nick
+	return t.getRealNick(ircNick)
+}
+
+func (t *Transport) getRealNick(ircNick string) string {
 	nick, ok := t.realNicks[ircNick]
 
 	if ok {