diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index c3c0336486..741444daa7 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -1526,8 +1526,8 @@ App::patch('/v1/projects/:projectId/smtp')
     ->param('replyTo', '', new Email(), 'Reply to email', true)
     ->param('host', '', new HostName(), 'SMTP server host name', true)
     ->param('port', 587, new Integer(), 'SMTP server port', true)
-    ->param('username', '', new Text(0), 'SMTP server username', true)
-    ->param('password', '', new Text(0), 'SMTP server password', true)
+    ->param('username', '', new Text(0, 0), 'SMTP server username', true)
+    ->param('password', '', new Text(0, 0), 'SMTP server password', true)
     ->param('secure', '', new WhiteList(['tls'], true), 'Does SMTP server use secure connection', true)
     ->inject('response')
     ->inject('dbForConsole')
@@ -1549,10 +1549,6 @@ App::patch('/v1/projects/:projectId/smtp')
                 throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Host is required when enabling SMTP.');
             } elseif (empty($port)) {
                 throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Port is required when enabling SMTP.');
-            } elseif (empty($username)) {
-                throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Username is required when enabling SMTP.');
-            } elseif (empty($password)) {
-                throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Password is required when enabling SMTP.');
             }
         }
 
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index f4d4604b18..e53ef2c34a 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -575,28 +575,28 @@ App::post('/v1/teams/:teamId/memberships')
                         ->setSmtpUsername($smtp['username'] ?? '')
                         ->setSmtpPassword($smtp['password'] ?? '')
                         ->setSmtpSecure($smtp['secure'] ?? '');
+
+                    if (!empty($customTemplate)) {
+                        if (!empty($customTemplate['senderEmail'])) {
+                            $senderEmail = $customTemplate['senderEmail'];
+                        }
+                        if (!empty($customTemplate['senderName'])) {
+                            $senderName = $customTemplate['senderName'];
+                        }
+                        if (!empty($customTemplate['replyTo'])) {
+                            $replyTo = $customTemplate['replyTo'];
+                        }
+
+                        $body = $customTemplate['message'] ?? '';
+                        $subject = $customTemplate['subject'] ?? $subject;
+                    }
+
+                    $mails
+                        ->setSmtpReplyTo($replyTo)
+                        ->setSmtpSenderEmail($senderEmail)
+                        ->setSmtpSenderName($senderName);
                 }
 
-                if (!empty($customTemplate)) {
-                    if (!empty($customTemplate['senderEmail'])) {
-                        $senderEmail = $customTemplate['senderEmail'];
-                    }
-                    if (!empty($customTemplate['senderName'])) {
-                        $senderName = $customTemplate['senderName'];
-                    }
-                    if (!empty($customTemplate['replyTo'])) {
-                        $replyTo = $customTemplate['replyTo'];
-                    }
-
-                    $body = $customTemplate['message'] ?? '';
-                    $subject = $customTemplate['subject'] ?? $subject;
-                }
-
-                $mails
-                    ->setSmtpReplyTo($replyTo)
-                    ->setSmtpSenderEmail($senderEmail)
-                    ->setSmtpSenderName($senderName);
-
                 $emailVariables = [
                     'owner' => $user->getAttribute('name'),
                     'team' => $team->getAttribute('name'),