diff --git a/.github/user_bug_report.md b/.github/user_bug_report.md
index 9e5f2a5..4b92a8e 100755
--- a/.github/user_bug_report.md
+++ b/.github/user_bug_report.md
@@ -8,9 +8,11 @@ assignees: ''
 ---
 
 # Bug Description
+
 A clear and concise description of what the bug is.
 
 # How to Reproduce
+
 Steps to reproduce the behavior:
 
 1. Go to '...'
@@ -19,16 +21,20 @@ Steps to reproduce the behavior:
 4. See error
 
 # Expected Behavior
+
 A clear and concise description of what you expected to happen.
 
 # Screenshots
+
 If applicable, add screenshots to help explain your problem.
 
 # System Information
- - System: [e.g. PC or iPhone11, ...]
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - KarakaVersion [e.g. 22]
+
+- System: [e.g. PC or iPhone11, ...]
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- KarakaVersion [e.g. 22]
 
 # Additional Information
+
 Add any other context about the problem here.
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 5a312d9..bc3ec2a 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -23,7 +23,6 @@ use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Model\Message\FormValidation;
 
-
 /**
  * Media class.
  *
@@ -75,8 +74,8 @@ final class ApiController extends Controller
     private function validateEmailCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['subject'] = empty($request->getData('subject')))
-            || ($val['body'] = empty($request->getData('body')))
+        if (($val['subject'] = !$request->hasData('subject'))
+            || ($val['body'] = !$request->hasData('body'))
         ) {
             return $val;
         }
diff --git a/Models/Email.php b/Models/Email.php
index 0e0fa8c..aaa0034 100755
--- a/Models/Email.php
+++ b/Models/Email.php
@@ -44,9 +44,14 @@ final class Email extends MailEmail implements \JsonSerializable
 
     private array $media = [];
 
+    /**
+     * Constructor.
+     *
+     * @since 1.0.0
+     */
     public function __construct()
     {
-        $this->account = new NullAccount();
+        $this->account   = new NullAccount();
         $this->createdAt = new \DateTimeImmutable('now');
     }