diff --git a/include/ircd/cache.h b/include/ircd/cache.h
index f618a1106..d9b857ef6 100644
--- a/include/ircd/cache.h
+++ b/include/ircd/cache.h
@@ -26,6 +26,7 @@
 namespace ircd  {
 namespace cache {
 
+using client::client;
 constexpr auto CACHEFILELEN = 30;
 constexpr auto LINKSLINELEN = HOSTLEN + HOSTLEN + REALLEN + 6;  // 2 servernames, 1 gecos, 3 spaces, ":1", '\0'
 
@@ -43,8 +44,8 @@ namespace motd
 	extern file user;
 	extern file oper;
 
-	void send_user(client::client *);
-	void send_oper(client::client *);
+	void send_user(client &);
+	void send_oper(client &);
 
 	void cache_user();
 	void cache_oper();
@@ -64,8 +65,6 @@ namespace help
 
 namespace serv
 {
-	using client::client;  //TODO: move up for motd::send_user/send_oper
-
 	enum flag
 	{
 		HIDDEN = 0x01,
diff --git a/ircd/cache.cc b/ircd/cache.cc
index 957184253..199c533b5 100644
--- a/ircd/cache.cc
+++ b/ircd/cache.cc
@@ -184,23 +184,23 @@ cache::motd::cache_oper(void)
  * side effects -
  */
 void
-cache::motd::send_user(client::client *source_p)
+cache::motd::send_user(client &source)
 {
-	const char *const myname(get_id(&me, source_p));
-	const char *const nick(get_id(source_p, source_p));
+	const char *const myname(get_id(me, source));
+	const char *const nick(get_id(source, source));
 
 	if (user.contents.empty())
 	{
-		sendto_one(source_p, form_str(ERR_NOMOTD), myname, nick);
+		sendto_one(&source, form_str(ERR_NOMOTD), myname, nick);
 		return;
 	}
 
-	sendto_one(source_p, form_str(RPL_MOTDSTART), myname, nick, me.name);
+	sendto_one(&source, form_str(RPL_MOTDSTART), myname, nick, me.name);
 
 	for (const auto &it : user.contents)
-		sendto_one(source_p, form_str(RPL_MOTD), myname, nick, it.c_str());
+		sendto_one(&source, form_str(RPL_MOTD), myname, nick, it.c_str());
 
-	sendto_one(source_p, form_str(RPL_ENDOFMOTD), myname, nick);
+	sendto_one(&source, form_str(RPL_ENDOFMOTD), myname, nick);
 }
 
 /* send_oper_motd()
@@ -210,17 +210,17 @@ cache::motd::send_user(client::client *source_p)
  * side effects -
  */
 void
-cache::motd::send_oper(client::client *source_p)
+cache::motd::send_oper(client &source)
 {
 	if (oper.contents.empty())
 		return;
 
-	sendto_one(source_p, form_str(RPL_OMOTDSTART), me.name, source_p->name);
+	sendto_one(&source, form_str(RPL_OMOTDSTART), me.name, source.name);
 
 	for (const auto &it : motd::oper.contents)
-		sendto_one(source_p, form_str(RPL_OMOTD), me.name, source_p->name, it.c_str());
+		sendto_one(&source, form_str(RPL_OMOTD), me.name, source.name, it.c_str());
 
-	sendto_one(source_p, form_str(RPL_ENDOFOMOTD), me.name, source_p->name);
+	sendto_one(&source, form_str(RPL_ENDOFOMOTD), me.name, source.name);
 }
 
 /* ircd::cache::file::file()
diff --git a/ircd/s_user.cc b/ircd/s_user.cc
index 0bb73f215..102f69a66 100644
--- a/ircd/s_user.cc
+++ b/ircd/s_user.cc
@@ -1333,7 +1333,7 @@ user_welcome(client::client *source_p)
 		sendto_one(source_p, form_str(RPL_ENDOFMOTD), me.name, source_p->name);
 	}
 	else
-		cache::motd::send_user(source_p);
+		cache::motd::send_user(*source_p);
 }
 
 /* oper_up()
@@ -1410,7 +1410,7 @@ oper_up(client::client *source_p, struct oper_conf *oper_p)
 	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
 	sendto_one_notice(source_p, ":*** Oper privilege set is %s", oper_p->privset->name);
 	sendto_one_notice(source_p, ":*** Oper privs are %s", oper_p->privset->privs);
-	cache::motd::send_oper(source_p);
+	cache::motd::send_oper(*source_p);
 }
 
 /*
diff --git a/modules/m_motd.cc b/modules/m_motd.cc
index 3f3a461e4..b719a2d5d 100644
--- a/modules/m_motd.cc
+++ b/modules/m_motd.cc
@@ -71,7 +71,7 @@ m_motd(struct MsgBuf *msgbuf_p, client::client &client, client::client &source,
 		return;
 
 	motd_spy(source);
-	cache::motd::send_user(&source);
+	cache::motd::send_user(source);
 }
 
 /*
@@ -85,7 +85,7 @@ mo_motd(struct MsgBuf *msgbuf_p, client::client &client, client::client &source,
 		return;
 
 	motd_spy(source);
-	cache::motd::send_user(&source);
+	cache::motd::send_user(source);
 }
 
 /* motd_spy()
diff --git a/modules/m_oper.cc b/modules/m_oper.cc
index 4e567706b..4e5957a1b 100644
--- a/modules/m_oper.cc
+++ b/modules/m_oper.cc
@@ -57,7 +57,7 @@ m_oper(struct MsgBuf *msgbuf_p, client::client &client, client::client &source,
 	if(is(source, umode::OPER))
 	{
 		sendto_one(&source, form_str(RPL_YOUREOPER), me.name, source.name);
-		cache::motd::send_oper(&source);
+		cache::motd::send_oper(source);
 		return;
 	}