diff --git a/__init__.py b/__init__.py
index 2b81e5c..e923eb9 100644
--- a/__init__.py
+++ b/__init__.py
@@ -37,7 +37,7 @@ import supybot.world as world
 
 # Use this for the version of this plugin.  You may wish to put a CVS keyword
 # in here if you're keeping the plugin in CVS or some similar system.
-__version__ = "1.1"
+__version__ = "1.2"
 
 # XXX Replace this with an appropriate author or supybot.Author instance.
 __author__ = supybot.authors.unknown
diff --git a/plugin.py b/plugin.py
index 298d3b3..05af753 100644
--- a/plugin.py
+++ b/plugin.py
@@ -92,6 +92,7 @@ def matchHostmask (pattern,n):
 						if len(L) == 1:
 							cache[n.prefix] = L[0]
 							n.setIp(L[0])
+					cache[n.prefix] = n.ip
 				except:
 					cache[n.prefix] = None
 	if n.ip != None and ircutils.hostmaskPatternEqual(pattern,'%s!%s@%s' % (nick,ident,n.ip)):
@@ -2190,10 +2191,10 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
 				account = None
 			n = self.getNick(irc,nick)
 			prefix = '%s!%s@%s' % (nick,ident,host)
+			n.setPrefix(prefix)
 			if n.ip == None and ip != '255.255.255.255':
 				# validate ip
 				n.setIp(ip)
-			n.setPrefix(prefix)
 			n.setAccount(account)
 			n.setRealname(realname)
 			#channel = msg.args[1]