diff --git a/VIRTUAL_VACATION/INSTALL.TXT b/VIRTUAL_VACATION/INSTALL.TXT
index 1d7f940d..2ee6edac 100644
--- a/VIRTUAL_VACATION/INSTALL.TXT
+++ b/VIRTUAL_VACATION/INSTALL.TXT
@@ -23,7 +23,7 @@ You need to have the following installed to be able to use Virtual Vacation.
 
 About Virtual Vacation
 ----------------------
-Virual Vacation is today done with a local shell account that can receive
+Virtual Vacation is today done with a local shell account that can receive
 email. The email is then handled by a Perl script which sends the Vacation
 message back to the sender.
 
diff --git a/edit-mailbox.php b/edit-mailbox.php
index a22642e7..c61d839d 100644
--- a/edit-mailbox.php
+++ b/edit-mailbox.php
@@ -153,6 +153,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
       $formvars['active']=$sqlActive;
 
       $result = db_update ('mailbox', "username='$fUsername' AND domain='$fDomain'", $formvars, array('modified'));
+      $maildir = $user_details['maildir'];
       if ($result != 1 || !mailbox_postedit($fUsername,$fDomain,$maildir, $quota)) {
          $tMessage = $PALANG['pEdit_mailbox_result_error'];
       }
diff --git a/templates/edit-vacation.php b/templates/edit-vacation.php
index 3fd349a7..268c910b 100644
--- a/templates/edit-vacation.php
+++ b/templates/edit-vacation.php
@@ -20,12 +20,12 @@ window.location="<?php print $fCanceltarget; ?>"
    </tr>
    <tr>
       <td><?php print $PALANG['pUsersVacation_subject'] . ":"; ?></td>
-      <td><textarea class="flat" cols="60" name="fSubject" ><?php print htmlentities($tSubject, ENT_QUOTES, 'UTF-8'); ?></textarea></td>
+      <td><textarea class="flat" cols="60" name="fSubject" ><?php print htmlentities(stripslashes($tSubject), ENT_QUOTES, 'UTF-8'); ?></textarea></td>
       <td>&nbsp;</td>
    </tr>
    <tr>
       <td><?php print $PALANG['pUsersVacation_body'] . ":"; ?></td>
-      <td><textarea class="flat" rows="10" cols="60" name="fBody" ><?php print htmlentities($tBody, ENT_QUOTES , 'UTF-8'); ?></textarea></td>
+      <td><textarea class="flat" rows="10" cols="60" name="fBody" ><?php print htmlentities(stripslashes($tBody), ENT_QUOTES , 'UTF-8'); ?></textarea></td>
       <td>&nbsp;</td>
    </tr>
    <tr>