diff --git a/genpass.module b/genpass.module
index be49561..bd6cee7 100644
--- a/genpass.module
+++ b/genpass.module
@@ -186,11 +186,11 @@ function genpass_register_validate($form, &$form_state) {
       drupal_set_message(t('Since you did not provide a password, it was generated automatically for this account.'));
     }
     // Optional - User did not provide password, so it was generated
-    elseif ($form_state['values']['genpass_mode'] == GENPASS_OPTIONAL) {
+    elseif (($form_state['values']['genpass_mode'] == GENPASS_OPTIONAL) && (user_access('administer users'))) {
       drupal_set_message(t('Since you did not provide a password, the following was generated for you: <strong>!password</strong>', array('!password' => $pass)));
     }
     // Restricted - User was forced to receive a generated password
-    elseif ($form_state['values']['genpass_mode'] == GENPASS_RESTRICTED) {
+    elseif (($form_state['values']['genpass_mode'] == GENPASS_RESTRICTED) && (user_access('administer users'))) {
       drupal_set_message(t('The following password was generated for you: <strong>!password</strong>', array('!password' => $pass)));
     }
   }