diff --git a/signup_roles.module b/signup_roles.module
index 073ff43..78a4be8 100644
--- a/signup_roles.module
+++ b/signup_roles.module
@@ -1,5 +1,5 @@
 <?php
-// $Id: 
+// $Id:
 /**
  * @file
  * The Signup roles module allows administrators to configure a site so that it
@@ -21,6 +21,7 @@ function signup_roles_signup_sign_up($node, $account) {
   if (empty($grant_roles)) {
     return;
   }
+  // Confirm only current roles are being granted.
   $site_roles = user_roles(TRUE);
   $grant_roles = array_intersect_key($site_roles, $grant_roles);
   $grant_roles_string = implode(', ', $grant_roles);
@@ -29,7 +30,7 @@ function signup_roles_signup_sign_up($node, $account) {
   $roles += $account->roles;
   user_save($account, array('roles' => $roles));
   if ($account) {
-    watchdog('signup_roles', 'Granted roles %roles to %name.', array('%roles' => $grant_roles_string, '%name' => $account->name));  
+    watchdog('signup_roles', 'Granted roles %roles to %name.', array('%roles' => $grant_roles_string, '%name' => $account->name));
   }
   else {
     watchdog('signup_roles', 'Error granting roles %roles to %name', array('%roles' => $grant_roles_string, '%name' => $account->name));
@@ -41,12 +42,21 @@ function signup_roles_signup_sign_up($node, $account) {
  */
 function signup_roles_form_alter(&$form, $form_state, $form_id) {
   if ($form_id == 'signup_settings_form') {
+    // Only show them roles beyond the Authenticated.
+    $roles = user_roles(TRUE);
+    unset($roles[DRUPAL_AUTHENTICATED_RID]);
     $form['adv_settings']['signup_roles_grant'] = array(
       '#type' => 'checkboxes',
       '#title' => t('Grant these roles when a signup is created'),
-      '#default_value' => variable_get('signup_grant_roles', array()),
-      '#options' => user_roles(TRUE),
+      '#default_value' => variable_get('signup_roles_grant', array()),
+      '#options' => $roles,
       '#weight' => 6,
     );
+    // If they don't have roles beyond authenticated, advise them on what to do.
+    if (empty($roles)) {
+      $form['adv_settings']['signup_roles_grant']['#description'] =  t('Your site has no roles beyond authenticated, <a href="!create_url">create a role</a> to use this feature',
+          array('!create_url' => url('admin/user/roles')));
+      $form['adv_settings']['signup_roles_grant']['#disabled'] = TRUE;
+    }
   }
 }
\ No newline at end of file