diff --git a/src/mumble/Messages.cpp b/src/mumble/Messages.cpp
index d6763e9cc..c8f808d99 100644
--- a/src/mumble/Messages.cpp
+++ b/src/mumble/Messages.cpp
@@ -103,6 +103,9 @@ void MainWindow::msgReject(const MumbleProto::Reject &msg) {
 		case MumbleProto::Reject_RejectType_WrongServerPW:
 			reason = tr("Wrong password");
 			break;
+		case MumbleProto::Reject_RejectType_AuthenticatorFail:
+			reason = tr("Your account information can not be verified currently. Please try again later");
+			break;
 		default:
 			break;
 	}
diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp
index 7c21afddd..1a9a253d1 100644
--- a/src/murmur/Messages.cpp
+++ b/src/murmur/Messages.cpp
@@ -138,7 +138,7 @@ void Server::msgAuthenticate(ServerUser *uSource, MumbleProto::Authenticate &msg
 		reason = "Invalid server password";
 		rtType = MumbleProto::Reject_RejectType_WrongServerPW;
 	} else if (id==-3) {
-		reason = "Your account information can not be verified currently. Please try again later.";
+		reason = "Your account information can not be verified currently. Please try again later";
 		rtType = MumbleProto::Reject_RejectType_AuthenticatorFail;
 	} else {
 		ok = true;
diff --git a/src/murmur/Murmur.ice b/src/murmur/Murmur.ice
index 4c303eb72..8c389f938 100644
--- a/src/murmur/Murmur.ice
+++ b/src/murmur/Murmur.ice
@@ -352,7 +352,7 @@ module Murmur
 		 *  @param certstrong True if certificate was valid and signed by a trusted CA.
 		 *  @param newname Set this to change the username from the supplied one.
 		 *  @param groups List of groups on the root channel that the user will be added to for the duration of the connection.
-		 *  @return UserID of authenticated user, -1 for authentication failures and -2 for unknown user (fallthrough).
+		 *  @return UserID of authenticated user, -1 for authentication failures and -2 for unknown user (fallthrough). You can pass through -3 to notify the user they could not be authenticated at this time with a clearer message than -1 (The recommended usage of -3 is during SERVER_DOWN exception handling in your authenticator script to avoid user confusion i.e. Showing invalid username password message when their credentials are correct, but the cause is the authenticator is unable to validate due to MySQL/LDAP being unavailable)
 		 */
 		idempotent int authenticate(string name, string pw, CertificateList certificates, string certhash, bool certstrong, out string newname, out GroupNameList groups);