diff --git a/admin_tickets.php b/admin_tickets.php
index c7077dee..3bf19209 100644
--- a/admin_tickets.php
+++ b/admin_tickets.php
@@ -375,7 +375,7 @@ if ($page == 'tickets'
 			$priorities = makeoption($lng['ticket']['high'], '1', $mainticket->Get('priority'), true, true);
 			$priorities.= makeoption($lng['ticket']['normal'], '2', $mainticket->Get('priority'), true, true);
 			$priorities.= makeoption($lng['ticket']['low'], '3', $mainticket->Get('priority'), true, true);
-			$subject = $mainticket->Get('subject');
+			$subject = htmlentities($mainticket->Get('subject'));
 			$ticket_replies_count = $numrows_andere + 1;
 
 			// don't forget the main-ticket!
diff --git a/customer_tickets.php b/customer_tickets.php
index 120b0779..e5784ed5 100644
--- a/customer_tickets.php
+++ b/customer_tickets.php
@@ -324,7 +324,7 @@ if ($page == 'overview') {
 			$priorities = makeoption($lng['ticket']['high'], '1', $mainticket->Get('priority'), true, true);
 			$priorities.= makeoption($lng['ticket']['normal'], '2', $mainticket->Get('priority'), true, true);
 			$priorities.= makeoption($lng['ticket']['low'], '3', $mainticket->Get('priority'), true, true);
-			$subject = $mainticket->Get('subject');
+			$subject = htmlentities($mainticket->Get('subject'));
 			$ticket_replies_count = $numrows_andere + 1;
 
 			// don't forget the main-ticket!
diff --git a/install/froxlor.sql b/install/froxlor.sql
index 01bed57a..cc8dc2ef 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -431,8 +431,8 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('system', 'nameservers', ''),
 	('system', 'mxservers', ''),
 	('system', 'mod_fcgid', '0'),
-	('system', 'apacheconf_vhost', '/etc/apache2/vhosts.conf'),
-	('system', 'apacheconf_diroptions', '/etc/apache2/diroptions.conf'),
+	('system', 'apacheconf_vhost', '/etc/apache2/sites-enabled/'),
+	('system', 'apacheconf_diroptions', '/etc/apache2/sites-enabled/'),
 	('system', 'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'),
 	('system', 'webalizer_quiet', '2'),
 	('system', 'last_archive_run', '000000'),