diff --git a/mail/inc/class.mail_sieve.inc.php b/mail/inc/class.mail_sieve.inc.php
index bb2db674b4..e37f5932a2 100644
--- a/mail/inc/class.mail_sieve.inc.php
+++ b/mail/inc/class.mail_sieve.inc.php
@@ -690,7 +690,7 @@ class mail_sieve
 			$this->errorStack['days'] = lang('Please select the number of days to wait between responses').'!';
 		}
 
-		if(is_array($_vacation['addresses']))
+		if(is_array($_vacation['addresses']) && !empty($_vacation['addresses']))
 		{
 			$regexp="/^[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\.-][a-z0-9]+)*)+\\.[a-z]{2,}$/i";
 			foreach ($_vacation['addresses'] as $addr)
diff --git a/mail/templates/default/sieve.vacation.xet b/mail/templates/default/sieve.vacation.xet
index bc0f6dfd77..c93ee61465 100644
--- a/mail/templates/default/sieve.vacation.xet
+++ b/mail/templates/default/sieve.vacation.xet
@@ -25,7 +25,7 @@
 				</row>
 				<row>
 					<description value="Respond to mail sent to:"/>
-					<taglist-email id="addresses" allowFreeEntries="true" empty_label="Respond" span="2"/>
+					<taglist-email id="addresses" needed="true" class="et2_required" allowFreeEntries="true" empty_label="Respond" span="2"/>
 					<button class="$cont[hideIfSieveDisabled] et2_fullWidth"  label="Add all my aliases" id="AllAddresses" onclick='app.mail.sieve_vac_all_aliases()'/>
 				</row>
 				<row>
@@ -40,7 +40,7 @@
 				<row>
 					<description value="With message:"/>
 					<vbox span="all">
-						<textbox multiline="true" id="text" width="99%" height="150px"/>
+						<textbox multiline="true" id="text" width="99%" height="150px" needed="true" class="et2_required"/>
 						<description id="by_date_label" value="You can use $$start$$ for the above start date and $$end$$ for the end date."/>
 					</vbox>
 				</row>
@@ -54,7 +54,7 @@
 					<hbox span="all">
 						<button label="Save" id="button[save]" class="$cont[hideIfSieveDisabled]"/>
 						<button label="Apply" id="button[apply]" class="$cont[hideIfSieveDisabled]"/>
-						<button label="Cancel" id="button[cancel]" class="$cont[hideIfSieveDisabled]"/>
+						<button label="Cancel" id="button[cancel]" onclick="window.close();" class="$cont[hideIfSieveDisabled]"/>
 					</hbox>
 				</row> 
 			</rows>