diff --git a/html/user/mail_passwd.php b/html/user/mail_passwd.php
index a4b4864e2c..9c6c7b24f6 100644
--- a/html/user/mail_passwd.php
+++ b/html/user/mail_passwd.php
@@ -18,14 +18,19 @@ if (!$user) {
         Try reentering your email address.<p>
     ";
 } else {
-    $user->email_addr = $email_addr;
-    page_head("Mailed account key");
-    $retval = send_auth_email($user, false);
-    if ($retval) {
-        email_sent_message($email_addr);
-    } else {
-        echo "Can't send email to $user->email_addr: $retval";
-    }
+	if (substr($user->authenticator, 0, 1) == 'x') {
+		page_head("Account Currently Disabled");
+		echo "This account has been administratively disabled.";
+	} else {
+		$user->email_addr = $email_addr;
+		page_head("Mailed account key");
+		$retval = send_auth_email($user, false);
+		if ($retval) {
+			email_sent_message($email_addr);
+		} else {
+			echo "Can't send email to $user->email_addr: $retval";
+		}
+	}
 }
 
 page_tail();