diff --git a/modules/core/ns_register.cpp b/modules/core/ns_register.cpp
index 15d5c2331..900e78f7c 100644
--- a/modules/core/ns_register.cpp
+++ b/modules/core/ns_register.cpp
@@ -53,6 +53,10 @@ class CommandNSConfirm : public Command
 				Log(LOG_COMMAND, u, this) << "to confirm their email";
 				source.Reply(_("Your email address of \002%s\002 has been confirmed."), u->Account()->email.c_str());
 				u->Account()->UnsetFlag(NI_UNCONFIRMED);
+				ircdproto->SendAccountLogin(u, u->Account());
+				NickAlias *na = findnick(u->nick);
+				if (na && na->nc == u->Account())
+					u->SetMode(nickserv->Bot(), UMODE_REGISTERED);
 			}
 			else
 				source.Reply(_("Invalid passcode."));