diff --git a/Changes b/Changes
index 7184d330d..e1ddf12df 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,7 @@ A K alias to chanserv kick command
 A KB alias to chanserv ban command
 F Unban command to accept an optional nick arg
 F Small typo in services.conf
+F Crash when users change their host that are identified to a group, but not a nick
 
 Anope Version 1.9.1
 --------------------
diff --git a/src/users.c b/src/users.c
index 0197b08d5..52fcaf799 100644
--- a/src/users.c
+++ b/src/users.c
@@ -390,7 +390,7 @@ void User::UpdateHost()
 {
 	NickAlias *na = findnick(this->nick);
 
-	if (nick_identified(this) || (na && !na->nc->HasFlag(NI_SECURE) && IsRecognized()))
+	if (na && (this->nc && na->nc == this->nc || !na->nc->HasFlag(NI_SECURE) && IsRecognized()))
 	{
 		if (na->last_usermask)
 			delete [] na->last_usermask;