Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.715
diff -u -r1.715 user.module
--- modules/user/user.module	21 Nov 2006 20:25:24 -0000	1.715
+++ modules/user/user.module	22 Nov 2006 00:19:26 -0000
@@ -1361,7 +1361,7 @@
     form_set_error('mail', $error);
   }
   else if (db_num_rows(db_query("SELECT uid FROM {users} WHERE uid != %d AND LOWER(mail) = LOWER('%s')", $uid, $edit['mail'])) > 0) {
-    form_set_error('mail', t('The e-mail address %email is already taken.', array('%email' => $edit['mail'])));
+    form_set_error('mail', t('The e-mail address %email is already registered. '. l(t('Have you forgotten your password?'), 'user/password'), array('%email' => $edit['mail'])));
   }
   else if (drupal_is_denied('mail', $edit['mail'])) {
     form_set_error('mail', t('The e-mail address %email has been denied access.', array('%email' => $edit['mail'])));