diff --git a/admin_domains.php b/admin_domains.php
index 2c024ae2..18e84c1a 100644
--- a/admin_domains.php
+++ b/admin_domains.php
@@ -1361,12 +1361,19 @@ if ($page == 'domains'
 				if ($aliasdomain != 0) {
 					// Overwrite given ipandports with these of the "main" domain
 					$ipandports = array();
+					$ssl_ipandports = array();
 					$origipresult_stmt = Database::prepare("
 						SELECT `id_ipandports` FROM `" . TABLE_DOMAINTOIP ."` WHERE `id_domain` = :aliasdomain
 					");
 					Database::pexecute($origipresult_stmt, array('aliasdomain' => $aliasdomain));
+					$ipdata_stmt = Database::prepare("SELECT * FROM `".TABLE_PANEL_IPSANDPORTS."` WHERE `id` = :ipid");
 					while ($origip = $origipresult_stmt->fetch(PDO::FETCH_ASSOC)) {
-						$ipandports[] = $origip['id_ipandports'];
+						$_origip_tmp = Database::pexecute_first($ipdata_stmt, array('ipid' => $origip['id_ipandports']));
+						if ($_origip_tmp['ssl'] == 0) {
+							$ipandports[] = $origip['id_ipandports'];
+						} else {
+							$ssl_ipandports[] = $origip['id_ipandports'];
+						}
 					}
 					$aliasdomain_check_stmt = Database::prepare("
 						SELECT `d`.`id` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_CUSTOMERS . "` `c`
diff --git a/lib/functions/froxlor/function.convertUtf8.php b/lib/functions/froxlor/function.convertUtf8.php
deleted file mode 100644
index 382ea6bf..00000000
--- a/lib/functions/froxlor/function.convertUtf8.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Florian Aders <eleras@froxlor.org>
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Functions
- *
- */
-
-/**
- * Convert a string to UTF-8 if needed
- * @param string String to be converted
- * @return string UTF-8 encoded string
- *
- * @author Florian Aders <eleras@froxlor.org>
- */
-
-function convertUtf8 ($string) {
-	if (!isUtf8($string))
-	{
-		$string = utf8_encode($string);
-	}
-	return addslashes($string);
-}
\ No newline at end of file
diff --git a/lib/functions/froxlor/function.isUtf8.php b/lib/functions/froxlor/function.isUtf8.php
deleted file mode 100644
index c4d56572..00000000
--- a/lib/functions/froxlor/function.isUtf8.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Florian Aders <eleras@froxlor.org>
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Functions
- *
- */
-
-/**
- * Function which checks if a string is UTF8 encoded or not
- * @param string String to be checked
- * @return bool true if string is UTF8 encoded
- *
- * @author Florian Aders <eleras@froxlor.org>
- */
-
-function isUtf8 ($string) {
-	// From http://w3.org/International/questions/qa-forms-utf-8.html
-	return preg_match('%^(?:
-		[\x09\x0A\x0D\x20-\x7E]            # ASCII
-		| [\xC2-\xDF][\x80-\xBF]            # non-overlong 2-byte
-		|  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
-		| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
-		|  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
-		|  \xF0[\x90-\xBF][\x80-\xBF]{2}    # planes 1-3
-		| [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
-		|  \xF4[\x80-\x8F][\x80-\xBF]{2}    # plane 16
-		)*$%xs', $string
-	);
-}