diff --git a/TODO b/TODO
index 27848579..d1d9f61d 100644
--- a/TODO
+++ b/TODO
@@ -72,17 +72,17 @@ FIXED	 	 	0001201 		Virtualusers conflict with local users when using libnss-mys
  	 	 	0001204 		php5-suhosin
 FIXED	 	 	0001203 		Add check for PHP version and required PHP modules in install script
  	 	 	0001198 		More online help wanted
- 	 	 	0001039 		Additional text field for infos in customers "Contact Data"
+WONTFIX 	 	0001039 		Additional text field for infos in customers "Contact Data"
 WONTFIX 	 	0001187 		additional Invoices
 WONTFIX 	 	0001059 		Billing - Create contract - Filename should contain customername
 FIXED	 	 	0001013 		lighttpd - every customer should have his own php.ini
  	 	 	0001189 		Autoresponder: support for multiline "From:" headers
 FIXED	 	 	0001113 		realtime functionality broken
  	 	 	0001186 		subdomains and php configuration
- 	 	 	0001112 		customers should be able to create custom cronjobs
+WONTFIX 	 	0001112 		customers should be able to create custom cronjobs
  	 	 	0001079 		Protected dir only works only after a force-reload on lighttpd
 FIXED	 	 	0001080 		host of third level gets overridden by second-level when wwwserveralias is not set on lighttpd
- 	 	 	0001159 		serveral errors for lighttpd
+FIXED	 	 	0001159 		serveral errors for lighttpd
 FIXED	 	 	0001181 		lighttpd cronjob config for subdomains is empty
  	 	 	0001034 		Cron-Tasks: apache-logfiles directory
  	 	 	0001136 		Configuration of "dead" mail adresses
diff --git a/scripts/cron_tasks.inc.http.20.lighttpd.php b/scripts/cron_tasks.inc.http.20.lighttpd.php
index a8744c0a..704e7ce2 100644
--- a/scripts/cron_tasks.inc.http.20.lighttpd.php
+++ b/scripts/cron_tasks.inc.http.20.lighttpd.php
@@ -414,7 +414,7 @@ class lighttpd
 			}
 			else
 			{
-				$server_string[] = $domain_name;
+				$server_string[] = '^'.$domain_name.'$';
 			}
 		}
 
@@ -432,11 +432,11 @@ class lighttpd
 			{
 				if($alias_domain['wwwserveralias'] == '1')
 				{
-					$server_string[] = '^(www.)?' . $alias_domain_name;
+					$server_string[] = '^(www\.|)' . $alias_domain_name . '$';
 				}
 				else
 				{
-					$server_string[] = $alias_domain_name;
+					$server_string[] = '^'.$alias_domain_name . '$';
 				}
 			}
 		}