diff --git a/edit-vacation.php b/edit-vacation.php
index 0a33e8e4..ee82259a 100644
--- a/edit-vacation.php
+++ b/edit-vacation.php
@@ -76,8 +76,8 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
 
    $tUseremail = $fUsername;
    $tDomain = $fDomain;
-   if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; }
-   if ($tBody == '') { $tBody = $PALANG['pUsersVacation_body_text']; }
+   if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); }
+   if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); }
 
 }
 
@@ -103,8 +103,8 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
    }
 
    $tUseremail = $fUsername;
-   if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; }
-   if ($tBody == '') { $tBody = $PALANG['pUsersVacation_body_text']; }
+   if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); }
+   if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); }
 
    //if change, remove old one, then perhaps set new one
    if (!empty ($fBack) || !empty ($fChange))
diff --git a/templates/edit-vacation.tpl b/templates/edit-vacation.tpl
index bdf05ecc..8a9fe214 100644
--- a/templates/edit-vacation.tpl
+++ b/templates/edit-vacation.tpl
@@ -19,7 +19,7 @@ window.location="<?php print $fCanceltarget; ?>"
    </tr>
    <tr>
       <td><?php print $PALANG['pUsersVacation_subject'] . ":"; ?></td>
-      <td><textarea class="flat" cols="60" name="fSubject" ><?php print $tSubject; ?></textarea></td>
+      <td><textarea class="flat" cols="60" name="fSubject" ><?php print htmlentities($tSubject, ENT_QUOTES, 'UTF-8'); ?></textarea></td>
       <td>&nbsp;</td>
    </tr>
    <tr>