diff --git a/lib/mail.php b/lib/mail.php
index 0fb36a465a..4c73a0b7be 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -157,7 +157,7 @@ function mail_new_incoming_notify($user) {
 }
 
 function mail_new_incoming_address() {
-	$prefix = common_good_rand(8);
+	$prefix = common_confirmation_code(64);
 	$suffix = mail_domain();
 	return $prefix . '@' . $suffix;
 }