diff --git a/keep/providers/smtp_provider/smtp_provider.py b/keep/providers/smtp_provider/smtp_provider.py
index 17f8ca03f..f8f187c09 100644
--- a/keep/providers/smtp_provider/smtp_provider.py
+++ b/keep/providers/smtp_provider/smtp_provider.py
@@ -17,25 +17,6 @@
 
 @pydantic.dataclasses.dataclass
 class SmtpProviderAuthConfig:
-    smtp_username: str = dataclasses.field(
-        metadata={
-            "required": False,
-            "description": "SMTP username",
-            "config_main_group": "authentication",
-        },
-        default="",
-    )
-
-    smtp_password: str = dataclasses.field(
-        metadata={
-            "required": False,
-            "sensitive": True,
-            "description": "SMTP password",
-            "config_main_group": "authentication",
-        },
-        default="",
-    )
-
     smtp_server: str = dataclasses.field(
         metadata={
             "required": True,
@@ -49,7 +30,8 @@ class SmtpProviderAuthConfig:
             "required": True,
             "description": "SMTP port",
             "config_main_group": "authentication",
-        }
+        },
+        default=587,
     )
 
     encryption: typing.Literal["SSL", "TLS"] = dataclasses.field(
@@ -63,6 +45,25 @@ class SmtpProviderAuthConfig:
         },
     )
 
+    smtp_username: str = dataclasses.field(
+        metadata={
+            "required": False,
+            "description": "SMTP username",
+            "config_main_group": "authentication",
+        },
+        default="",
+    )
+
+    smtp_password: str = dataclasses.field(
+        metadata={
+            "required": False,
+            "sensitive": True,
+            "description": "SMTP password",
+            "config_main_group": "authentication",
+        },
+        default="",
+    )
+
 
 class SmtpProvider(BaseProvider):
     PROVIDER_SCOPES = [