diff --git a/wp-includes/comment-functions.php b/wp-includes/comment-functions.php
index 3bafa8ce8..b448ed7b6 100644
--- a/wp-includes/comment-functions.php
+++ b/wp-includes/comment-functions.php
@@ -864,8 +864,9 @@ function check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $
 				return false;
 		} elseif( $author != '' && $email != '' ) {
 			$ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1");
-			if ( 1 == $ok_to_comment && false === strpos( $email, get_settings('moderation_keys')) )
-				return true;
+			if ( ( 1 == $ok_to_comment ) &&
+				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) )
+					return true;
 			else
 				return false;
 		} else {
diff --git a/wp-register.php b/wp-register.php
index e59def09c..2176c280e 100644
--- a/wp-register.php
+++ b/wp-register.php
@@ -109,7 +109,7 @@ default:
 	<p><input type="hidden" name="action" value="register" />
 	<label for="user_login"><?php _e('Username:') ?></label><br /> <input type="text" name="user_login" id="user_login" size="20" maxlength="20" value="<?php echo $user_login; ?>" /><br /></p>
 	<p><label for="user_email"><?php _e('E-mail:') ?></label><br /> <input type="text" name="user_email" id="user_email" size="25" maxlength="100" value="<?php echo $user_email; ?>" /></p>
-	<p>A password will be emailed to you.</p>
+	<p><?php _e('A password will be emailed to you.') ?></p>
 	<p class="submit"><input type="submit" value="<?php _e('Register') ?> &raquo;" id="submit" name="submit" /></p>
 </form>
 <ul>