diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html
index 90c71189..ed2db24d 100644
--- a/web/templates/admin/edit_mail_acc.html
+++ b/web/templates/admin/edit_mail_acc.html
@@ -65,7 +65,7 @@
                         </tr>
                         <tr>
                             <td>
-                                <input type="text" size="20" class="vst-input password" name="v_password" value="<?=htmlentities($v_password)?>">
+                                <input type="text" size="20" class="vst-input password" name="v_password" value="<?=htmlentities(trim($v_password, "'"))?>">
                             </td>
                          </tr>
                         <tr>
@@ -109,7 +109,7 @@
                                 <label><input type="checkbox" size="20" class="vst-checkbox" name="v_autoreply" <?php if ($v_autoreply == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('autoreplytable');"> <?php print __('Autoreply');?></label>
                             </td>
                         </tr>
-                        <tr>%20autofocuse=true%20onFocus=%27alert%28123%29%27%20x=%27%20autofocuse=true%20onFocus=%27alert%28123%29%27%20x=%27
+                        <tr>
                             <td class="step-left">
                                 <table style="display:<?php if ($v_autoreply == 'yes') { echo 'block';} else {echo 'none';}?> ;" id="autoreplytable">
                                     <tr>
@@ -192,15 +192,15 @@
                             <td><?=__('SMTP auth method')?>:</td>
                             <td><div><?=__('Normal password')?></div></td>
                         </tr>
-			<?
-			  list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-			  $webmail = "http://".$http_host."/webmail/";
-			  if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
-			  ?>
+                        <?
+                          list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
+                          $webmail = "http://".$http_host."/webmail/";
+                          if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
+                          ?>
                         <tr>
                             <td><?=__('Webmail URL')?>:</td>
                             <td><div><a class="vst" href="<?=$webmail?>" target="_blank"><?=$webmail?> <i></i></a></div></td>
-			</tr>
+                        </tr>
                     </table>
                 </div>
             </td>
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
index b8645dc8..d717a05f 100644
--- a/web/templates/admin/edit_user.html
+++ b/web/templates/admin/edit_user.html
@@ -64,7 +64,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input password" name="v_password" value="<?=htmlentities($v_password)?>">
+                                    <input type="text" size="20" class="vst-input password" name="v_password" value="<?=htmlentities(trim($v_password, "'"))?>">
                                 </td>
                             </tr>
                             <tr>
diff --git a/web/templates/admin/generate_ssl.html b/web/templates/admin/generate_ssl.html
index 23c0b2b9..0aef6006 100644
--- a/web/templates/admin/generate_ssl.html
+++ b/web/templates/admin/generate_ssl.html
@@ -54,7 +54,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_domain" value="<?php print htmlentities($v_domain) ?>">
+                                    <input type="text" size="20" class="vst-input" name="v_domain" value="<?=htmlentities(trim($v_domain, "'")) ?>">
                                 </td>
                             </tr>
                             <tr>
@@ -64,7 +64,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_email" value="<?php print htmlentities($v_email) ?>">
+                                    <input type="text" size="20" class="vst-input" name="v_email" value="<?=htmlentities(trim($v_email, "'")) ?>">
                                 </td>
                             </tr>
                             <tr>
@@ -75,7 +75,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_country" value="<?php print htmlentities($v_country)?>">
+                                    <input type="text" size="20" class="vst-input" name="v_country" value="<?=htmlentities(trim($v_country, "'"))?>">
                                 </td>
                             </tr>
                             <tr>
@@ -85,7 +85,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_state" value="<?php print htmlentities($v_state) ?>">
+                                    <input type="text" size="20" class="vst-input" name="v_state" value="<?=htmlentities(trim($v_state, "'")) ?>">
                                 </td>
                             </tr>
                             <tr>
@@ -95,7 +95,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_locality" value="<?php print htmlentities($v_locality) ?>">
+                                    <input type="text" size="20" class="vst-input" name="v_locality" value="<?=htmlentities(trim($v_locality, "'")) ?>">
                                 </td>
                             </tr>
                             <tr>
@@ -105,7 +105,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_org" value="<?php print htmlentities($v_org) ?>">
+                                    <input type="text" size="20" class="vst-input" name="v_org" value="<?=htmlentities(trim($v_org, "'")) ?>">
                                 </td>
                             </tr>
                         </table>