diff --git a/include/client.h b/include/client.h
index de05432..9f8709a 100644
--- a/include/client.h
+++ b/include/client.h
@@ -96,6 +96,7 @@ struct User
 	int refcnt;		/* Number of times this block is referenced */
 
 	char suser[NICKLEN+1];
+	struct Dictionary *metadata;
 };
 
 struct Server
@@ -177,8 +178,6 @@ struct Client
 	pre_client_t *preClient;
 
 	time_t large_ctcp_sent; /* ctcp to large group sent, relax flood checks */
-
-	struct Dictionary *metadata;
 };
 
 struct LocalUser
diff --git a/src/client.c b/src/client.c
index 7aa5b94..b372e88 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1657,8 +1657,10 @@ make_user(struct Client *client_p)
 	{
 		user = (struct User *) rb_bh_alloc(user_heap);
 		user->refcnt = 1;
+		user->metadata = irc_dictionary_create(irccmp);
 		client_p->user = user;
 	}
+
 	return user;
 }