diff --git a/edit-vacation.php b/edit-vacation.php
index 4984b695..d258c2ad 100644
--- a/edit-vacation.php
+++ b/edit-vacation.php
@@ -61,7 +61,7 @@ $vacation_domain = $CONF['vacation_domain'];
 $vacation_goto = preg_replace('/@/', '#', $fUsername);
 $vacation_goto = $vacation_goto . '@' . $vacation_domain;
 
-$fCanceltarget = $CONF['postfix_admin_url'] . "/list-virtual.php?domain=$fDomain";
+$fCanceltarget = $CONF['postfix_admin_url'] . "/list-virtual.php?domain=" . urlencode($fDomain);
 
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {
diff --git a/templates/edit-vacation.php b/templates/edit-vacation.php
index e5ddb888..cca38bf9 100644
--- a/templates/edit-vacation.php
+++ b/templates/edit-vacation.php
@@ -2,7 +2,7 @@
 <script type="text/javascript">
 function newLocation()
 {
-    window.location= "<?php echo urlencode($fCanceltarget); ?>"
+    window.location= "<?php echo $fCanceltarget; ?>"
 }
 </script>
 <div id="edit_form">