diff --git a/Theme/Backend/clients-create.tpl.php b/Theme/Backend/clients-create.tpl.php
index 3ba299e..ab75cff 100644
--- a/Theme/Backend/clients-create.tpl.php
+++ b/Theme/Backend/clients-create.tpl.php
@@ -277,11 +277,11 @@ echo $this->getData('nav')->render(); ?>
                                 <td colspan="6"><?= $footerView->render(); ?>
                             <tbody>
                             <tr>
-                                <td><?= htmlspecialchars($this->request->getOrigin(), ENT_COMPAT, 'utf-8'); ?>
-                                <td><?= htmlspecialchars($this->request->getHeader()->getAccount(), ENT_COMPAT, 'utf-8'); ?>
-                                <td><?= htmlspecialchars($this->request->getHeader()->getAccount(), ENT_COMPAT, 'utf-8'); ?>
+                                <td><?= $this->printHtml($this->request->getOrigin()); ?>
+                                <td><?= $this->printHtml($this->request->getHeader()->getAccount()); ?>
+                                <td><?= $this->printHtml($this->request->getHeader()->getAccount()); ?>
                                 <td>Creating customer
-                                <td><?= htmlspecialchars((new \DateTime('now'))->format('Y-m-d H:i:s'), ENT_COMPAT, 'utf-8'); ?>
+                                <td><?= $this->printHtml((new \DateTime('now'))->format('Y-m-d H:i:s')); ?>
                         </table>
                     </div>
                 </div>
diff --git a/Theme/Backend/clients-list.tpl.php b/Theme/Backend/clients-list.tpl.php
index 5c8ae91..68b4ed5 100644
--- a/Theme/Backend/clients-list.tpl.php
+++ b/Theme/Backend/clients-list.tpl.php
@@ -81,10 +81,10 @@ echo $this->getData('nav')->render(); ?>
                 <?php $count = 0; foreach($clients as $key => $value) : $count++; 
                  $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/sales/client/profile?{?}&id=' . $value->getId()); ?>
                 <tr>
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getNumber(), ENT_COMPAT, 'utf-8'); ?></a>
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getProfile()->getAccount()->getName1(), ENT_COMPAT, 'utf-8'); ?></a>
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getProfile()->getAccount()->getName2(), ENT_COMPAT, 'utf-8'); ?></a>
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getProfile()->getAccount()->getName3(), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getNumber()); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getProfile()->getAccount()->getName1()); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getProfile()->getAccount()->getName2()); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getProfile()->getAccount()->getName3()); ?></a>
                     <td>
                     <td>
                     <td>
diff --git a/Theme/Backend/clients-profile.tpl.php b/Theme/Backend/clients-profile.tpl.php
index 1adea8e..4f5326a 100644
--- a/Theme/Backend/clients-profile.tpl.php
+++ b/Theme/Backend/clients-profile.tpl.php
@@ -44,13 +44,13 @@ echo $this->getData('nav')->render();
                             <form>
                                 <table class="layout w-100">
                                     <tr><td><label for="iId"><?= $this->getHtml('ID', 0, 0); ?></label>
-                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" id="iId" min="1" name="id" value="<?= htmlspecialchars($client->getNumber(), ENT_COMPAT, 'utf-8'); ?>" disabled></span>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" id="iId" min="1" name="id" value="<?= $this->printHtml($client->getNumber()); ?>" disabled></span>
                                     <tr><td><label for="iName1"><?= $this->getHtml('Name1') ?></label>
-                                    <tr><td><input type="text" id="iName1" name="name1" placeholder="&#xf040;" value="<?= htmlspecialchars($client->getProfile()->getAccount()->getName1(), ENT_COMPAT, 'utf-8'); ?>" required>
+                                    <tr><td><input type="text" id="iName1" name="name1" placeholder="&#xf040;" value="<?= $this->printHtml($client->getProfile()->getAccount()->getName1()); ?>" required>
                                     <tr><td><label for="iName2"><?= $this->getHtml('Name2') ?></label>
-                                    <tr><td><input type="text" id="iName2" name="name2" value="<?= htmlspecialchars($client->getProfile()->getAccount()->getName2(), ENT_COMPAT, 'utf-8'); ?>" placeholder="&#xf040;">
+                                    <tr><td><input type="text" id="iName2" name="name2" value="<?= $this->printHtml($client->getProfile()->getAccount()->getName2()); ?>" placeholder="&#xf040;">
                                     <tr><td><label for="iName3"><?= $this->getHtml('Name3') ?></label>
-                                    <tr><td><input type="text" id="iName3" name="name3" value="<?= htmlspecialchars($client->getProfile()->getAccount()->getName3(), ENT_COMPAT, 'utf-8'); ?>" placeholder="&#xf040;">
+                                    <tr><td><input type="text" id="iName3" name="name3" value="<?= $this->printHtml($client->getProfile()->getAccount()->getName3()); ?>" placeholder="&#xf040;">
                                     <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Save', 0, 0); ?>"> <input type="submit" value="<?= $this->getHtml('Delete', 0, 0); ?>">
                                 </table>
                             </form>
@@ -280,11 +280,11 @@ echo $this->getData('nav')->render();
                                 <td colspan="6"><?= $footerView->render(); ?>
                             <tbody>
                             <tr>
-                                <td><?= htmlspecialchars($this->request->getOrigin(), ENT_COMPAT, 'utf-8'); ?>
-                                <td><?= htmlspecialchars($this->request->getHeader()->getAccount(), ENT_COMPAT, 'utf-8'); ?>
-                                <td><?= htmlspecialchars($this->request->getHeader()->getAccount(), ENT_COMPAT, 'utf-8'); ?>
+                                <td><?= $this->printHtml($this->request->getOrigin()); ?>
+                                <td><?= $this->printHtml($this->request->getHeader()->getAccount()); ?>
+                                <td><?= $this->printHtml($this->request->getHeader()->getAccount()); ?>
                                 <td>Creating customer
-                                <td><?= htmlspecialchars((new \DateTime('now'))->format('Y-m-d H:i:s'), ENT_COMPAT, 'utf-8'); ?>
+                                <td><?= $this->printHtml((new \DateTime('now'))->format('Y-m-d H:i:s')); ?>
                         </table>
                     </div>
                 </div>