diff --git a/customer_domains.php b/customer_domains.php
index 5cec08e2..7c3644f4 100644
--- a/customer_domains.php
+++ b/customer_domains.php
@@ -429,8 +429,6 @@ elseif($page == 'domains')
 		$alias_check = $alias_check['count'];
 		$_doredirect = false;
 
-		
-
 		if(isset($result['customerid'])
 		   && $result['customerid'] == $userinfo['customerid'])
 		{
@@ -625,22 +623,8 @@ elseif($page == 'domains')
 
 				$resultips = $db->query("SELECT `p`.`ip` AS `ip` FROM `".TABLE_PANEL_IPSANDPORTS."` `p` LEFT JOIN `".TABLE_DOMAINTOIP."` `dip` ON ( `dip`.`id_ipandports` = `p`.`id` ) WHERE `dip`.`id_domain` = '".(int)$result['id']."' GROUP BY `p`.`ip`");
 				$result_ipandport['ip'] = '';
-				while ($rowip = $db->fetch_array($resultips))
-					  {
-						  if(filter_var($rowip['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
-						  {
-							  $result_ipandport['ip'] .= '[' . $rowip['ip'] . ']' . "  \n";
-						  }
-						  else
-						  {
-							  $result_ipandport['ip'] .= $rowip['ip'] . "  \n";
-						  }
-					  }
-
-
-				if(filter_var($result_ipandport['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
-				{
-					$result_ipandport['ip'] = '[' . $result_ipandport['ip'] . ']';
+				while ($rowip = $db->fetch_array($resultips)) {
+					$result_ipandport['ip'] .= $rowip['ip'] . "<br />";
 				}
 
 				$domainip = $result_ipandport['ip'];
diff --git a/customer_ftp.php b/customer_ftp.php
index 631bcac3..b85433be 100644
--- a/customer_ftp.php
+++ b/customer_ftp.php
@@ -112,6 +112,7 @@ if ($page == 'overview') {
 			if (isset($_POST['send'])
 			   && $_POST['send'] == 'send'
 			) {
+				// @FIXME use a good path-validating regex here (refs #1231)
 				$path = validate($_POST['path'], 'path');
 				$password = validate($_POST['ftp_password'], 'password');
 				$password = validatePassword($password);
@@ -241,6 +242,7 @@ if ($page == 'overview') {
 			if (isset($_POST['send'])
 			   && $_POST['send'] == 'send'
 			) {
+				// @FIXME use a good path-validating regex here (refs #1231)
 				$path = validate($_POST['path'], 'path');
 				
 				$_setnewpass = false;
diff --git a/lib/configfiles/wheezy.inc.php b/lib/configfiles/wheezy.inc.php
index c86b9a79..0b3f5d75 100644
--- a/lib/configfiles/wheezy.inc.php
+++ b/lib/configfiles/wheezy.inc.php
@@ -421,7 +421,7 @@ return Array(
 							'# this is needed for libapache2-mod-fastcgi to install',
 							'apt-get install apache2-suexec libapache2-mod-fastcgi php5-fpm',
 							'# change fpm-configuration directory to "/etc/php5/fpm/pool.d/" in froxlor',
-							'sed -i.bak \'s/^;include=\/etc\/php5\/fpm/*.conf/include=include=\/etc\/php5\/fpm\/pool.d\/*.conf/\' /etc/php5/fpm/php-fpm.conf',
+							'sed -e \'s|;include=\/etc\/php5\/fpm\/\*.conf|include=\/etc\/php5\/fpm\/pool.d\/\*.conf|g\' -i /etc/php5/fpm/php-fpm.conf',
 							'rm /etc/php5/fpm/pool.d/www.conf',
 							'a2enmod suexec fastcgi actions',
 							($settings['phpfpm']['enabled_ownvhost'] == '1') ? 'groupadd -f '.$settings['phpfpm']['vhost_httpgroup'] : null,