diff --git a/message_subscribe_ui/message_subscribe_ui.module b/message_subscribe_ui/message_subscribe_ui.module
index 35febcb..c367758 100644
--- a/message_subscribe_ui/message_subscribe_ui.module
+++ b/message_subscribe_ui/message_subscribe_ui.module
@@ -169,15 +169,13 @@ function message_subscribe_ui_tab($account, $flag_name = NULL) {
         watchdog('message_sbuscribe', t('Flag %name is not setup corrcetly. It is probably disabled or have no bundles configured.'), $params);
         return drupal_set_message(t('There Flag %name is not configured correctly.', $params), 'error');
       }
-
-      if (!$rel_set) {
-        $rel_set = TRUE;
-        $relationships[$key]['flag'] = $flag_name;
-        $view->display_handler->set_option('relationships', $relationships);
+      if ($relationships[$key]['label'] == 'email_flag')    {
+        $flag_name = 'email_' . str_replace($prefix, '', $flag_name);
       }
+      $relationships[$key]['flag'] = $flag_name;
+      $view->display_handler->set_option('relationships', $relationships);
     }
   }
 
-
   return $view->preview();
 }