diff --git a/src/configreader.cpp b/src/configreader.cpp
index 1c82b7387..617d5fdd5 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -585,6 +585,11 @@ bool DoneConnect(ServerConfig *conf, const char*)
 	{
 		User *u = *n;
 
+		/*
+		 * Make their existing class go away so that SetClass doesn't touch a wild ptr, important!
+		 */
+		u->MyClass = NULL;
+
 		u->SetClass();
 
 		/*