diff --git a/Theme/Backend/task-analysis.tpl.php b/Theme/Backend/task-analysis.tpl.php
index aee2bac..37c57bf 100644
--- a/Theme/Backend/task-analysis.tpl.php
+++ b/Theme/Backend/task-analysis.tpl.php
@@ -24,7 +24,7 @@ echo $this->getData('nav')->render(); ?>
         <form>
             <table class="layout wf-100">
                 <tr><td><label for="iAccount"><?= $this->l11n->lang['Tasks']['Account']; ?></label>
-                <tr><td><input type="text" id="iAccount" name="account" placeholder="">
+                <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iAccount" name="account" placeholder="&#xf007; Guest" required></span>
                 <tr><td><label for="iFrom"><?= $this->l11n->lang['Tasks']['From']; ?></label>
                 <tr><td><input type="datetime-local" id="iFrom" name="from" value="<?= (new \DateTime('NOW'))->format('Y-m-d\TH:i:s') ?>">
                 <tr><td><label for="iTo"><?= $this->l11n->lang['Tasks']['To']; ?></label>
diff --git a/Theme/Backend/task-create.tpl.php b/Theme/Backend/task-create.tpl.php
index 2bb4b4a..7d57a1e 100644
--- a/Theme/Backend/task-create.tpl.php
+++ b/Theme/Backend/task-create.tpl.php
@@ -26,9 +26,9 @@ echo $this->getData('nav')->render(); ?>
             <table class="layout wf-100">
                 <tbody>
                 <tr><td colspan="2"><label for="iReceiver"><?= $this->l11n->lang['Tasks']['To']; ?></label>
-                <tr><td><input type="text" id="iReceiver" name="forward" placeholder="&#xf007; Guest"><td><button><?= $this->l11n->lang[0]['Add']; ?></button>
+                <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iReceiver" name="receiver" placeholder="&#xf007; Guest" required></span><td><button><?= $this->l11n->lang[0]['Add']; ?></button>
                 <tr><td colspan="2"><label for="iObserver"><?= $this->l11n->lang['Tasks']['CC']; ?></label>
-                <tr><td><input type="text" id="iObserver" name="observer" placeholder="&#xf007; Guest"><td><button><?= $this->l11n->lang[0]['Add']; ?></button>
+                <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iObserver" name="observer" placeholder="&#xf007; Guest" required></span><td><button><?= $this->l11n->lang[0]['Add']; ?></button>
                 <tr><td colspan="2"><label for="iDue"><?= $this->l11n->lang['Tasks']['Due']; ?></label>
                 <tr><td><input type="datetime-local" id="iDue" name="due" value="<?= (new \DateTime('NOW'))->format('Y-m-d\TH:i:s') ?>"><td>
                 <tr><td colspan="2"><label for="iTitle"><?= $this->l11n->lang['Tasks']['Title']; ?></label>
diff --git a/Theme/backend/task-analysis.tpl.php b/Theme/backend/task-analysis.tpl.php
index aee2bac..37c57bf 100644
--- a/Theme/backend/task-analysis.tpl.php
+++ b/Theme/backend/task-analysis.tpl.php
@@ -24,7 +24,7 @@ echo $this->getData('nav')->render(); ?>
         <form>
             <table class="layout wf-100">
                 <tr><td><label for="iAccount"><?= $this->l11n->lang['Tasks']['Account']; ?></label>
-                <tr><td><input type="text" id="iAccount" name="account" placeholder="">
+                <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iAccount" name="account" placeholder="&#xf007; Guest" required></span>
                 <tr><td><label for="iFrom"><?= $this->l11n->lang['Tasks']['From']; ?></label>
                 <tr><td><input type="datetime-local" id="iFrom" name="from" value="<?= (new \DateTime('NOW'))->format('Y-m-d\TH:i:s') ?>">
                 <tr><td><label for="iTo"><?= $this->l11n->lang['Tasks']['To']; ?></label>
diff --git a/Theme/backend/task-create.tpl.php b/Theme/backend/task-create.tpl.php
index 2bb4b4a..7d57a1e 100644
--- a/Theme/backend/task-create.tpl.php
+++ b/Theme/backend/task-create.tpl.php
@@ -26,9 +26,9 @@ echo $this->getData('nav')->render(); ?>
             <table class="layout wf-100">
                 <tbody>
                 <tr><td colspan="2"><label for="iReceiver"><?= $this->l11n->lang['Tasks']['To']; ?></label>
-                <tr><td><input type="text" id="iReceiver" name="forward" placeholder="&#xf007; Guest"><td><button><?= $this->l11n->lang[0]['Add']; ?></button>
+                <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iReceiver" name="receiver" placeholder="&#xf007; Guest" required></span><td><button><?= $this->l11n->lang[0]['Add']; ?></button>
                 <tr><td colspan="2"><label for="iObserver"><?= $this->l11n->lang['Tasks']['CC']; ?></label>
-                <tr><td><input type="text" id="iObserver" name="observer" placeholder="&#xf007; Guest"><td><button><?= $this->l11n->lang[0]['Add']; ?></button>
+                <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iObserver" name="observer" placeholder="&#xf007; Guest" required></span><td><button><?= $this->l11n->lang[0]['Add']; ?></button>
                 <tr><td colspan="2"><label for="iDue"><?= $this->l11n->lang['Tasks']['Due']; ?></label>
                 <tr><td><input type="datetime-local" id="iDue" name="due" value="<?= (new \DateTime('NOW'))->format('Y-m-d\TH:i:s') ?>"><td>
                 <tr><td colspan="2"><label for="iTitle"><?= $this->l11n->lang['Tasks']['Title']; ?></label>