diff --git a/logintoboggan.module b/logintoboggan.module
index 3e47dee..0091bac 100755
--- a/logintoboggan.module
+++ b/logintoboggan.module
@@ -508,6 +508,8 @@ function logintoboggan_user_register_submit($form, &$form_state) {
   }
 
   if (variable_get('user_register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL) == USER_REGISTER_VISITORS) {
+    // No need to notify the user in this case.
+    $message = '';
 
     // Create new user account, no administrator approval required.
     $mailkey = 'register_no_approval_required';
@@ -523,7 +525,9 @@ function logintoboggan_user_register_submit($form, &$form_state) {
   // Mail the user.
   _user_mail_notify($mailkey, $account);
 
-  drupal_set_message($message);
+  if ($message) {
+    drupal_set_message($message);
+  }
 
   // where do we need to redirect after registration?
   $redirect = _logintoboggan_process_redirect(variable_get('logintoboggan_redirect_on_register', ''), $account);