diff --git a/Changes b/Changes
index abf310075..210a839a9 100644
--- a/Changes
+++ b/Changes
@@ -684,3 +684,4 @@
 - Moved lopt and whowas to anUser (saves 8 bytes for every server)
 - Removed aClient->history, not used (saves 4 bytes for every user/server)
 - Fixed compile error with SSL
+- Fixed a /list and /quit bug
diff --git a/src/list.c b/src/list.c
index 179c708fb..82bceb433 100644
--- a/src/list.c
+++ b/src/list.c
@@ -188,6 +188,8 @@ anUser *make_user(cptr)
 		user->invited = NULL;
 		user->silence = NULL;
 		user->server = NULL;
+		user->lopt = NULL;
+		user->whowas = NULL;
 		user->virthost = MyMalloc(5);
 		*user->virthost = '\0';
 		cptr->user = user;