diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 48c29b343a..96fd618abf 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -1404,9 +1404,9 @@ App::post('/v1/account/tokens/email')
             'team' => '',
             'project' => $project->getAttribute('name'),
             'otp' => $tokenSecret,
-            'agentDevice' => '<strong>' . ( $agentDevice['deviceBrand'] ?? $agentDevice['deviceBrand'] ?? 'Unknown device') . '</strong>',
-            'agentClient' => '<strong>' . ($agentClient['clientName'] ?? 'Unknown client') . '</strong>',
-            'agentOs' => '<strong>' . ($agentOs['osName'] ?? 'Unknown OS') . '</strong>',
+            'agentDevice' => '<strong>' . (!empty($agentDevice['deviceBrand']) ? $agentDevice['deviceBrand'] : 'Unknown device') . '</strong>',
+            'agentClient' => '<strong>' . (!empty($agentOs['clientName']) ? $agentOs['clientName'] : 'Unknown client') . '</strong>',
+            'agentOs' => '<strong>' . (!empty($agentOs['osName']) ? $agentOs['osName'] : 'Unknown OS') . '</strong>',
             'phrase' => '<strong>' . (!empty($securityPhrase) ? $securityPhrase : '') . '</strong>'
         ];
 
diff --git a/src/Appwrite/Platform/Workers/Certificates.php b/src/Appwrite/Platform/Workers/Certificates.php
index 4d3cb8f593..a57c6703d0 100644
--- a/src/Appwrite/Platform/Workers/Certificates.php
+++ b/src/Appwrite/Platform/Workers/Certificates.php
@@ -429,7 +429,7 @@ class Certificates extends Action
         // Send mail to administratore mail
         $template = Template::fromFile(__DIR__ . '/../../../../app/config/locale/templates/email-certificate-failed.tpl');
         $template->setParam('{{domain}}', $domain);
-        $template->setParam('{{error}}', \nl2br($errorMessage));
+        $template->setParam('{{error}}', \nl2br($errorMessage), false);
         $template->setParam('{{attempts}}', $attempt);
 
         $subject = 'Certificate for ' . $domain . ' failed to generate';
@@ -437,7 +437,6 @@ class Certificates extends Action
         $emailVariables = [
             'direction' => $locale->getText('settings.direction'),
             'domain' => $domain,
-            'error' => '<br><pre>' . $errorMessage . '</pre>',
             'attempt' => $attempt,
             'project' => 'Console',
             'redirect' => 'https://' . $domain,
diff --git a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
index c89adad1d2..9ed2bf0b60 100644
--- a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
+++ b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
@@ -604,6 +604,8 @@ class ProjectsConsoleClientTest extends Scope
 
         $this->assertEquals(204, $response['headers']['status-code']);
 
+        \sleep(5);
+
         $emails = $this->getLastEmail(2);
         $this->assertCount(2, $emails);
         $this->assertEquals('custommailer@appwrite.io', $emails[0]['from'][0]['address']);