diff --git a/src/Bundle/ChillMainBundle/config/services/notification.yaml b/src/Bundle/ChillMainBundle/config/services/notification.yaml
index 82ab9b29e..9498fddb5 100644
--- a/src/Bundle/ChillMainBundle/config/services/notification.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/notification.yaml
@@ -14,7 +14,15 @@ services:
 
     Chill\MainBundle\Notification\NotificationFlagManager:
         arguments:
-            $notificationFlagProviders: !tagged_iterator chill_main.notification_flag_provider
+            $notificationFlagProviders: !tagged_iterator notification_flag_provider
+
+    Chill\MainBundle\Notification\FlagProviders\NotificationByUserFlagProvider:
+        tags:
+            - { name: notification_flag_provider }
+
+    Chill\MainBundle\Notification\FlagProviders\WorkflowTransitionNotificationFlagProvider:
+        tags:
+            - { name: notification_flag_provider }
 
     Chill\MainBundle\Notification\NotificationHandlerManager:
         arguments:
diff --git a/src/Bundle/ChillMainBundle/Notification/FlagProviders/DesignatedReferrerNotificationFlagProvider.php b/src/Bundle/ChillPersonBundle/Notification/FlagProviders/DesignatedReferrerNotificationFlagProvider.php
similarity index 76%
rename from src/Bundle/ChillMainBundle/Notification/FlagProviders/DesignatedReferrerNotificationFlagProvider.php
rename to src/Bundle/ChillPersonBundle/Notification/FlagProviders/DesignatedReferrerNotificationFlagProvider.php
index 582cd231b..5e6144d51 100644
--- a/src/Bundle/ChillMainBundle/Notification/FlagProviders/DesignatedReferrerNotificationFlagProvider.php
+++ b/src/Bundle/ChillPersonBundle/Notification/FlagProviders/DesignatedReferrerNotificationFlagProvider.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Chill\MainBundle\Notification\FlagProviders;
+namespace Chill\PersonBundle\Notification\FlagProviders;
 
+use Chill\MainBundle\Notification\FlagProviders\NotificationFlagProviderInterface;
 use Symfony\Component\Translation\TranslatableMessage;
 use Symfony\Contracts\Translation\TranslatableInterface;
 
diff --git a/src/Bundle/ChillMainBundle/Notification/FlagProviders/PersonAddressMoveNotificationFlagProvider.php b/src/Bundle/ChillPersonBundle/Notification/FlagProviders/PersonAddressMoveNotificationFlagProvider.php
similarity index 76%
rename from src/Bundle/ChillMainBundle/Notification/FlagProviders/PersonAddressMoveNotificationFlagProvider.php
rename to src/Bundle/ChillPersonBundle/Notification/FlagProviders/PersonAddressMoveNotificationFlagProvider.php
index 5842681ea..9d712f95e 100644
--- a/src/Bundle/ChillMainBundle/Notification/FlagProviders/PersonAddressMoveNotificationFlagProvider.php
+++ b/src/Bundle/ChillPersonBundle/Notification/FlagProviders/PersonAddressMoveNotificationFlagProvider.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Chill\MainBundle\Notification\FlagProviders;
+namespace Chill\PersonBundle\Notification\FlagProviders;
 
+use Chill\MainBundle\Notification\FlagProviders\NotificationFlagProviderInterface;
 use Symfony\Component\Translation\TranslatableMessage;
 use Symfony\Contracts\Translation\TranslatableInterface;
 
diff --git a/src/Bundle/ChillPersonBundle/config/services/notification.yaml b/src/Bundle/ChillPersonBundle/config/services/notification.yaml
index f5d227429..fe0946bcf 100644
--- a/src/Bundle/ChillPersonBundle/config/services/notification.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/notification.yaml
@@ -8,3 +8,9 @@ services:
     Chill\PersonBundle\Notification\AccompanyingPeriodWorkEvaluationDocumentNotificationHandler:
         autowire: true
         autoconfigure: true
+    Chill\PersonBundle\Notification\FlagProviders\DesignatedReferrerNotificationFlagProvider:
+        tags:
+            - { name: notification_flag_provider }
+    Chill\PersonBundle\Notification\FlagProviders\PersonAddressMoveNotificationFlagProvider:
+        tags:
+            - { name: notification_flag_provider }