diff --git a/docker-compose.yml b/docker-compose.yml
index aa2bfdd16a..14f00205ba 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -254,7 +254,7 @@ services:
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: appwrite/console:7.8.26
+    image: appwrite/console:7.8.45
     restart: unless-stopped
     networks:
       - appwrite
diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/SMTP/Tests/Create.php b/src/Appwrite/Platform/Modules/Project/Http/Project/SMTP/Tests/Create.php
index b61147aef6..a41292466c 100644
--- a/src/Appwrite/Platform/Modules/Project/Http/Project/SMTP/Tests/Create.php
+++ b/src/Appwrite/Platform/Modules/Project/Http/Project/SMTP/Tests/Create.php
@@ -40,9 +40,6 @@ class Create extends Action
             ->desc('Create project SMTP test')
             ->groups(['api', 'project'])
             ->label('scope', 'project.write')
-            ->label('event', 'smtp.*.update')
-            ->label('audits.event', 'project.smtp.update')
-            ->label('audits.resource', 'project.smtp/{response.$id}')
             ->label('sdk', new Method(
                 namespace: 'project',
                 group: 'smtp',
diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/SMTP/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/SMTP/Update.php
index 97295aa7b5..58360058da 100644
--- a/src/Appwrite/Platform/Modules/Project/Http/Project/SMTP/Update.php
+++ b/src/Appwrite/Platform/Modules/Project/Http/Project/SMTP/Update.php
@@ -102,7 +102,7 @@ class Update extends Action
                 $smtp[$key] = ${$key};
             }
         }
-        
+
         // Backwards compatibility
         $smtp['replyToEmail'] = $smtp['replyToEmail'] ?? $smtp['replyTo'] ?? '';
 
@@ -110,7 +110,7 @@ class Update extends Action
         $requiredKeys = ['host', 'port', 'senderEmail'];
         foreach ($requiredKeys as $key) {
             if (empty($smtp[$key])) {
-                throw new \Exception('"' . $key . '" is required. Please provide a value.');
+                throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, '"' . $key . '" is required. Please provide a value.');
             }
         }
 
@@ -143,6 +143,12 @@ class Update extends Action
                 if (!$valid) {
                     throw new \Exception('Connection is not valid.');
                 }
+                
+                // Auto-enable if configuration is valid
+                // Dont do this if specifically request to mark disabled
+                if(\is_null($enabled)) {
+                    $smtp['enabled'] = true;
+                }
             } catch (Throwable $error) {
                 throw new Exception(Exception::PROJECT_SMTP_CONFIG_INVALID, $error->getMessage());
             }
diff --git a/src/Appwrite/Platform/Modules/Project/Services/Http.php b/src/Appwrite/Platform/Modules/Project/Services/Http.php
index f768fb31be..e9e30f7590 100644
--- a/src/Appwrite/Platform/Modules/Project/Services/Http.php
+++ b/src/Appwrite/Platform/Modules/Project/Services/Http.php
@@ -24,8 +24,8 @@ use Appwrite\Platform\Modules\Project\Http\Project\Platforms\Windows\Update as U
 use Appwrite\Platform\Modules\Project\Http\Project\Platforms\XList as ListPlatforms;
 use Appwrite\Platform\Modules\Project\Http\Project\Protocols\Status\Update as UpdateProjectProtocolStatus;
 use Appwrite\Platform\Modules\Project\Http\Project\Services\Status\Update as UpdateProjectServiceStatus;
-use Appwrite\Platform\Modules\Project\Http\Project\SMTP\Update as UpdateSMTP;
 use Appwrite\Platform\Modules\Project\Http\Project\SMTP\Tests\Create as CreateSMTPTest;
+use Appwrite\Platform\Modules\Project\Http\Project\SMTP\Update as UpdateSMTP;
 use Appwrite\Platform\Modules\Project\Http\Project\Variables\Create as CreateVariable;
 use Appwrite\Platform\Modules\Project\Http\Project\Variables\Delete as DeleteVariable;
 use Appwrite\Platform\Modules\Project\Http\Project\Variables\Get as GetVariable;