diff --git a/interface/web/tools/resync.php b/interface/web/tools/resync.php
index 86ba27dfa98eb1ddc28d3d426ebfd83a983e0f78..dcc0ac28111053c030c0d2b546ae7de66023a094 100644
--- a/interface/web/tools/resync.php
+++ b/interface/web/tools/resync.php
@@ -122,7 +122,7 @@ if(isset($_POST['resync_db']) && $_POST['resync_db'] == 1) {
 if(isset($_POST['resync_mailbox']) && $_POST['resync_mailbox'] == 1) {
 	$db_table = 'mail_user';
 	$index_field = 'mailuser_id';
-	$sql = "SELECT * FROM ".$db_table." WHERE active = 'y'";
+	$sql = "SELECT * FROM ".$db_table;
 	$records = $app->db->queryAllRecords($sql);
 	if(is_array($records)) {
 		foreach($records as $rec) {
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index a34c50b43f807532a8e5fb1a666ae5f4dd93718a..12507d9402d13d10f0d213962eadca718b209ab9 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -33,5 +33,6 @@ if header :contains "X-Spam-Flag" "YES" {
 vacation  :days 1
   :subject "Out of office reply"
   # :addresses ["test@test.int", "till@test.int"]
+  <tmpl_var name='addresses'>
   "<tmpl_var name='autoresponder_text'>";
 </tmpl_if>