diff --git a/includes/register_preapproved.admin.inc b/includes/register_preapproved.admin.inc
index 0af6f23..a9791c6 100644
--- a/includes/register_preapproved.admin.inc
+++ b/includes/register_preapproved.admin.inc
@@ -206,10 +206,12 @@ function register_preapproved_add_form_validate($form, &$form_state) {
         $errors[] = t('The e-mail address or domain %email is not valid.', $args);
       }
       elseif (db_select('users', 'u')->condition('u.mail', $email)->fields('u')->execute()->rowCount()) {
-        $errors[] = t('The e-mail address %email is already registered.', $args);
+        drupal_set_message('The e-mail address ' . $email . ' is already registered.', 'warning');
+        $form_state['values']['emails'] = str_replace($email,'', $form_state['values']['emails']);
       }
       elseif (db_select('register_preapproved', 'rp')->condition('rp.mail', $email)->fields('rp')->execute()->rowCount()) {
-        $errors[] = t('The e-mail address or domain %email is already pre-approved.', $args);
+        drupal_set_message('The e-mail address or domain ' . $email . ' is already pre-approved.', 'warning');
+        $form_state['values']['emails'] = str_replace($email,'', $form_state['values']['emails']);
       }
       elseif (drupal_strlen($email) > EMAIL_MAX_LENGTH) {
         $errors[] = t('The e-mail address or domain %email cannot not exceed !maxlength characters.', array('%email' => $email, '!maxlength' => EMAIL_MAX_LENGTH));