diff --git a/message_subscribe.module b/message_subscribe.module
index 9e3620c..d7b4aa1 100644
--- a/message_subscribe.module
+++ b/message_subscribe.module
@@ -410,6 +410,7 @@ function message_subscribe_message_subscribe_get_subscribers(Message $message, $
       }
     }
   }
+
   return $uids;
 }
 
@@ -631,7 +632,7 @@ function message_subscribe_flag_default_flags() {
  * @see message_subscribe_get_subscribers().
  */
 function _message_subscribe_add_default_notifiers(&$uids) {
-  $notifiers = variable_get('message_subscribe_default_notifiers', array());
+  $notifiers = variable_get('message_subscribe_default_notifiers', array('email' => 'email'));
   if (empty($notifiers)) {
     return;
   }
diff --git a/message_subscribe_email/message_subscribe_email.module b/message_subscribe_email/message_subscribe_email.module
index c0235cf..c9c864c 100644
--- a/message_subscribe_email/message_subscribe_email.module
+++ b/message_subscribe_email/message_subscribe_email.module
@@ -89,27 +89,13 @@ function message_subscribe_email_message_subscribe_get_subscribers_alter(&$uids,
     return;
   }
 
-  extract($values);
-  
-  foreach($context as $entity_type => $entity_ids) {
-    if (!$entity_ids) {
-      // No entity IDs flagged with this type.
-      continue;
-    }
+  $flags = message_subscribe_email_flag_get_flags();
 
-    if (!$flags = message_subscribe_email_flag_get_flags($entity_type)) {
-      // No flags for this entity type.
-      continue;
-    }
-    
-    $flag_ids = array();
-    // Build a list of flag Ids
-    foreach ($flags as $flag) {
-      $flag_ids[$flag->fid] = $flag->name;
-    }
+  $flag_ids = array();
+  foreach ($flags as $flag) {
+    $flag_ids[] = $flag->fid;
   }
 
-
   if (FLAG_API_VERSION == 2) {
     $result = db_select('flag_content', 'f');
   }