diff --git a/include/cache.h b/include/cache.h
index 059c583..b303f34 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -42,10 +42,11 @@ void free_cachefile(struct cachefile *);
 void load_help(void);
 
 void send_user_motd(struct Client *);
+void send_oper_motd(struct Client *);
 void cache_user_motd(void);
 
-struct Dictionary;
-extern struct Dictionary *help_dict_oper;
+struct Dictionary;
+extern struct Dictionary *help_dict_oper;
 extern struct Dictionary *help_dict_user;
-#endif
-
+#endif
+
diff --git a/src/s_user.c b/src/s_user.c
index a9537d0..2428c85 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -290,10 +290,14 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 	/* Apply nick override */
 	if(*source_p->preClient->spoofnick)
 	{
+		char note[NICKLEN + 10];
+
 		del_from_client_hash(source_p->name, source_p);
 		strlcpy(source_p->name, source_p->preClient->spoofnick, NICKLEN + 1);
 		add_to_client_hash(source_p->name, source_p);
-		rb_note(source_p->localClient->F->fd, "Nick: %s", source_p->name);
+
+		rb_snprintf(note, NICKLEN + 10, "Nick: %s", source_p->name);
+		rb_note(source_p->localClient->F, note);
 	}
 
 	if(!valid_hostname(source_p->host))