diff --git a/fb_user.admin.inc b/fb_user.admin.inc
index 1c2358dea6d6facac86fbde23f6b310b0d3cc6dc..66a9d7f4e33cfd910ef32c8641d5c7c6c51e917e 100644
--- a/fb_user.admin.inc
+++ b/fb_user.admin.inc
@@ -143,7 +143,6 @@ function fb_user_admin_form_alter(&$form, &$form_state, $form_id) {
       '#title' => t('Map accounts'),
       '#description' => t('Mapping an account means creating an entry in the fb_user table.  This allows Drupal to know which Facebook id corresponds to which local uid. <br/>Matching based on email works when the email extended permission is requested and only if the user is not already mapped to another account.'),
       '#options' => array(
-        //FB_USER_OPTION_MAP_NEVER => t('Never map accounts'),
         FB_USER_OPTION_MAP_ALWAYS => t('Map account when both local uid and Facebook id are known'),
         FB_USER_OPTION_MAP_EMAIL => t('Map account when Facebook email exactly matches local account'),
       ),
diff --git a/fb_user.module b/fb_user.module
index 8ea8373fa20d96ede4d33585ac9d3d539c7528d9..287ecf1c2e437dafb993bc5487d1b2799da5e030 100644
--- a/fb_user.module
+++ b/fb_user.module
@@ -600,7 +600,7 @@ function fb_user_user($op, &$edit, &$account, $category = NULL) {
     // A facebook user has logged in.  We can map the two accounts together.
     $fb_user_data = _fb_user_get_config($_fb_app);
     if (($fbu = fb_facebook_user()) &&
-        $fb_user_data['map_account'] == FB_USER_OPTION_MAP_ALWAYS &&
+        $fb_user_data['map_account'][FB_USER_OPTION_MAP_ALWAYS] &&
         !fb_controls(FB_USER_CONTROL_NO_CREATE_MAP)) {
 
       // Create fb_user record if it doesn't exist or update existing one