diff --git a/app/config/locale/translations/en.json b/app/config/locale/translations/en.json
index e533d82795..ab765fe47e 100644
--- a/app/config/locale/translations/en.json
+++ b/app/config/locale/translations/en.json
@@ -29,8 +29,8 @@
     "emails.invitation.signature": "{{project}} team",
     "emails.certificate.subject": "Certificate failure for %s",
     "emails.certificate.hello": "Hello",
-    "emails.certificate.body": "Certificate for your domain '{{domain}}' could not be renewed. This is attempt no. {{attempt}}, and the failure was caused by: {{error}}",
-    "emails.certificate.footer": "Certificate will still be valid for 30 days since first failure. We highly recommend investigating the case, otherwise your domain will end up without a secure certificate.",
+    "emails.certificate.body": "Certificate for your domain '{{domain}}' could not be generated. This is attempt no. {{attempt}}, and the failure was caused by: {{error}}",
+    "emails.certificate.footer": "Your previous certificate willl be valid for 30 days since the first failure. We highly recommend investigating this case, otherwise your domain will end up without a valid SSL communication.",
     "emails.certificate.thanks": "Thanks",
     "emails.certificate.signature": "{{project}} team",
     "locale.country.unknown": "Unknown",
diff --git a/app/controllers/general.php b/app/controllers/general.php
index 540c087dae..9bc1d789ee 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -99,13 +99,13 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons
                     ]);
     
                     $domainDocument = $dbForConsole->createDocument('domains', $domainDocument);
-                }
 
-                Console::info('Issuing a TLS certificate for the main domain (' . $domain->get() . ') in a few seconds...');
-    
-                Resque::enqueue(Event::CERTIFICATES_QUEUE_NAME, Event::CERTIFICATES_CLASS_NAME, [
-                    'domain' => $domain->get()
-                ]);
+                    Console::info('Issuing a TLS certificate for the main domain (' . $domain->get() . ') in a few seconds...');
+        
+                    Resque::enqueue(Event::CERTIFICATES_QUEUE_NAME, Event::CERTIFICATES_CLASS_NAME, [
+                        'domain' => $domain->get()
+                    ]);
+                }
             }
 
             $domains[$domain->get()] = true;
diff --git a/app/tasks/ssl.php b/app/tasks/ssl.php
index f28c0b8532..743be92a96 100644
--- a/app/tasks/ssl.php
+++ b/app/tasks/ssl.php
@@ -12,11 +12,11 @@ $cli
     ->desc('Validate server certificates')
     ->param('domain', App::getEnv('_APP_DOMAIN', ''), new Hostname(), 'Domain to generate certificate for. If empty, main domain will be used.', true)
     ->action(function ($domain) {
-        Console::success('Scheduling a job to issue a TLS certificate for domain:' . $domain);
+        Console::success('Scheduling a job to issue a TLS certificate for domain: ' . $domain);
 
         // Scheduje a job
         Resque::enqueue(Event::CERTIFICATES_QUEUE_NAME, Event::CERTIFICATES_CLASS_NAME, [
             'domain' => $domain,
-            'skipRenewCheck' => true
+            'skipCheck' => true
         ]);
     });
\ No newline at end of file
diff --git a/app/workers/certificates.php b/app/workers/certificates.php
index f1df74972c..f932e4b8f8 100644
--- a/app/workers/certificates.php
+++ b/app/workers/certificates.php
@@ -5,6 +5,7 @@ use Appwrite\Network\Validator\CNAME;
 use Appwrite\Resque\Worker;
 use Utopia\App;
 use Utopia\CLI\Console;
+use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
@@ -73,7 +74,7 @@ class CertificatesV1 extends Worker
         try {
             // Read arguments
             $domain = $this->args['domain']; // String of domain (hostname)
-            $skipRenewCheck = $this->args['skipRenewCheck'] ?? false; // If true, we won't double-check expiry from cert file
+            $skipCheck = $this->args['skipCheck'] ?? false; // If true, we won't double-check expiry from cert file
 
             $domain = new Domain((!empty($domain)) ? $domain : '');
 
@@ -92,13 +93,15 @@ class CertificatesV1 extends Worker
                 throw new Exception('You must set a valid security email address (_APP_SYSTEM_SECURITY_EMAIL_ADDRESS) to issue an SSL certificate.');
             }
             
-            $mainDomain = $this->getMainDomain();
-            $isMainDomain = !isset($mainDomain) || $domain->get() === $mainDomain;
-            $this->validateDomain($domain, $isMainDomain);
+            // Validate domain and DNS records. Skip if job is forced
+            if(!$skipCheck) {
+                $mainDomain = $this->getMainDomain();
+                $isMainDomain = !isset($mainDomain) || $domain->get() === $mainDomain;
+                $this->validateDomain($domain, $isMainDomain);
+            }
 
-            // If certificate exists already, double-check expiry date
-            // If asked to skip, we won't
-            if(!$skipRenewCheck && !$this->isRenewRequired($domain->get())) {
+            // If certificate exists already, double-check expiry date. Skip if job is forced
+            if(!$skipCheck && !$this->isRenewRequired($domain->get())) {
                 throw new Exception('Renew isn\'t required.');
             }
 
@@ -113,7 +116,7 @@ class CertificatesV1 extends Worker
             ]));
     
             // Give certificates to Traefik
-            $this->applyCertificateFiles($domain->get());
+            $this->applyCertificateFiles($domain->get(), $letsEncryptData);
             
             // Update certificate info stored in database
             $certificate->setAttribute('renewDate', $this->getRenewDate($domain->get()));
@@ -304,10 +307,11 @@ class CertificatesV1 extends Worker
      * Method to take files from Let's Encrypt, and put it into Traefik.
      *
      * @param string $domain Domain which certificate was generated for
+     * @param array $letsEncryptData Let's Encrypt logs to use for additional info when throwing error
      *
      * @return void
      */
-    private function applyCertificateFiles(string $domain): void {
+    private function applyCertificateFiles(string $domain, array $letsEncryptData): void {
         // Prepare folder in storage for domain
         $path = APP_STORAGE_CERTIFICATES . '/' . $domain;
         if (!\is_readable($path)) {
@@ -317,27 +321,28 @@ class CertificatesV1 extends Worker
         }
 
         // Move generated files from certbot into our storage
-        if(!@\rename('/etc/letsencrypt/live/'.$domain.'/cert.pem', APP_STORAGE_CERTIFICATES.'/'.$domain.'/cert.pem')) {
-            throw new Exception('Failed to rename certificate cert.pem.');
+        if(!@\rename('/etc/letsencrypt/live/'.$domain.'/cert.pem', APP_STORAGE_CERTIFICATES . '/' . $domain . '/cert.pem')) {
+            throw new Exception('Failed to rename certificate cert.pem. Let\'s Encrypt log: ' . $letsEncryptData['stderr'] . ' ; ' . $letsEncryptData['stdout']);
         }
 
         if (!@\rename('/etc/letsencrypt/live/' . $domain . '/chain.pem', APP_STORAGE_CERTIFICATES . '/' . $domain . '/chain.pem')) {
-            throw new Exception('Failed to rename certificate chain.pem.');
+            throw new Exception('Failed to rename certificate chain.pem. Let\'s Encrypt log: ' . $letsEncryptData['stderr'] . ' ; ' . $letsEncryptData['stdout']);
         }
 
         if (!@\rename('/etc/letsencrypt/live/' . $domain . '/fullchain.pem', APP_STORAGE_CERTIFICATES . '/' . $domain . '/fullchain.pem')) {
-            throw new Exception('Failed to rename certificate fullchain.pem.');
+            throw new Exception('Failed to rename certificate fullchain.pem. Let\'s Encrypt log: ' . $letsEncryptData['stderr'] . ' ; ' . $letsEncryptData['stdout']);
         }
 
         if (!@\rename('/etc/letsencrypt/live/' . $domain . '/privkey.pem', APP_STORAGE_CERTIFICATES . '/' . $domain . '/privkey.pem')) {
-            throw new Exception('Failed to rename certificate privkey.pem.');
+            throw new Exception('Failed to rename certificate privkey.pem. Let\'s Encrypt log: ' . $letsEncryptData['stderr'] . ' ; ' . $letsEncryptData['stdout']);
         }
 
-        $config =
-            "tls:" .
-            "  certificates:" . 
-            "    - certFile: /storage/certificates/{$domain}/fullchain.pem" . 
-            "      keyFile: /storage/certificates/{$domain}/privkey.pem";
+        $config = \implode(PHP_EOL, [
+            "tls:",
+            "  certificates:",
+            "    - certFile: /storage/certificates/{$domain}/fullchain.pem",
+            "      keyFile: /storage/certificates/{$domain}/privkey.pem"
+        ]);
         
         // Save configuration into Traefik using our new cert files
         if (!\file_put_contents(APP_STORAGE_CONFIG . '/' . $domain . '.yml', $config)) {
@@ -396,7 +401,10 @@ class CertificatesV1 extends Worker
             $domainDocument->setAttribute('certificateId', $certificateId);
 
             $this->dbForConsole->updateDocument('domains', $domainDocument->getId(), $domainDocument);
-            $this->dbForConsole->deleteCachedDocument('projects', $domainDocument->getAttribute('projectId'));
+
+            if($domainDocument->getAttribute('projectId')) {
+                $this->dbForConsole->deleteCachedDocument('projects', $domainDocument->getAttribute('projectId'));
+            }
         } 
     }
 }