diff -r 14a86f1e2bd4 src/modules/m_starttls.c
--- a/src/modules/m_starttls.c	Mon Apr 08 17:24:38 2013 -0700
+++ b/src/modules/m_starttls.c	Mon Apr 08 17:25:33 2013 -0700
@@ -92,11 +92,11 @@
 	}
 	if (IsSecure(sptr))
 	{
-		sendto_one(sptr, err_str(ERR_STARTTLS), me.name, sptr->name, "STARTTLS failed. Already using TLS.");
+		sendto_one(sptr, err_str(ERR_STARTTLS), me.name, "STARTTLS failed. Already using TLS.");
 		return 0;
 	}
 	dbuf_delete(&sptr->recvQ, 1000000); /* Clear up any remaining plaintext commands */
-	sendto_one(sptr, rpl_str(RPL_STARTTLS), me.name, sptr->name);
+	sendto_one(sptr, rpl_str(RPL_STARTTLS), me.name);
 	send_queued(sptr);
 
 	SetSSLStartTLSHandshake(sptr);
@@ -118,7 +118,7 @@
 	return 0;
 fail:
 	/* Failure */
-	sendto_one(sptr, err_str(ERR_STARTTLS), me.name, sptr->name, "STARTTLS failed");
+	sendto_one(sptr, err_str(ERR_STARTTLS), me.name, "STARTTLS failed");
 	sptr->ssl = NULL;
 	sptr->flags &= ~FLAGS_SSL;
 	SetUnknown(sptr);
diff -r 14a86f1e2bd4 src/s_err.c
--- a/src/s_err.c	Mon Apr 08 17:24:38 2013 -0700
+++ b/src/s_err.c	Mon Apr 08 17:25:33 2013 -0700
@@ -726,7 +726,7 @@
 /* 667 */ NULL,
 /* 668 */ NULL,
 /* 669 */ NULL,
-/* 670 RPL_STARTTLS */ ":%s 670 %s :STARTTLS successful, go ahead with TLS handshake", /* kineircd */
+/* 670 RPL_STARTTLS */ ":%s 670 * :STARTTLS successful, go ahead with TLS handshake", /* kineircd */
 /* 671 RPL_WHOISSECURE */ ":%s 671 %s %s :%s", /* our variation on the kineircd numeric */
 /* 672 */ NULL, /* ithildin */
 /* 673 */ NULL, /* ithildin */
@@ -747,7 +747,7 @@
 /* 688 */ NULL, /* kineircd */
 /* 689 */ NULL, /* kineircd */
 /* 690 */ NULL, /* kineircd */
-/* 691 ERR_STARTTLS */ ":%s 691 %s :%s",
+/* 691 ERR_STARTTLS */ ":%s 691 * :%s",
 /* 692 */ NULL,
 /* 693 */ NULL,
 /* 694 */ NULL,