diff --git a/app/handler/provider_complaint.py b/app/handler/provider_complaint.py
index 86d25b45..57bcd12b 100644
--- a/app/handler/provider_complaint.py
+++ b/app/handler/provider_complaint.py
@@ -45,7 +45,7 @@ class ProviderComplaintOrigin(ABC):
         pass
 
 
-class TransactionalYahooOrigin(ProviderComplaintOrigin):
+class ProviderComplaintYahoo(ProviderComplaintOrigin):
     @classmethod
     def get_original_message(cls, message: Message) -> Optional[Message]:
         # 1st part is the container
@@ -63,7 +63,7 @@ class TransactionalYahooOrigin(ProviderComplaintOrigin):
         return "yahoo"
 
 
-class TransactionalHotmailOrigin(ProviderComplaintOrigin):
+class ProviderComplaintHotmail(ProviderComplaintOrigin):
     @classmethod
     def get_original_message(cls, message: Message) -> Optional[Message]:
         # 1st part is the container
@@ -82,11 +82,11 @@ class TransactionalHotmailOrigin(ProviderComplaintOrigin):
 
 
 def handle_hotmail_complaint(message: Message) -> bool:
-    return handle_complaint(message, TransactionalHotmailOrigin())
+    return handle_complaint(message, ProviderComplaintHotmail())
 
 
 def handle_yahoo_complaint(message: Message) -> bool:
-    return handle_complaint(message, TransactionalYahooOrigin())
+    return handle_complaint(message, ProviderComplaintYahoo())
 
 
 def find_alias_with_address(address: str) -> Optional[Alias]:
diff --git a/app/models.py b/app/models.py
index 1331c233..57199479 100644
--- a/app/models.py
+++ b/app/models.py
@@ -2905,6 +2905,9 @@ class PhoneMessage(Base, ModelMixin):
     number = orm.relationship(PhoneNumber)
 
 
+# endregion
+
+
 class AdminAuditLog(Base):
     __tablename__ = "admin_audit_log"
 
@@ -3017,7 +3020,7 @@ class ProviderComplaint(Base, ModelMixin):
 
     user_id = sa.Column(sa.ForeignKey("users.id"), nullable=False)
     state = sa.Column(sa.Integer, nullable=False)
-    phase = sa.Column(sa.Integer, nullable=False)
+    phase = sa.Column(sa.Integer, nullable=False, server_default=Phase.unknown.value)
     # Point to the email that has been refused
     refused_email_id = sa.Column(
         sa.ForeignKey("refused_email.id", ondelete="cascade"), nullable=True