diff --git a/customer_domains.php b/customer_domains.php
index 22cb0d25..2b01b267 100644
--- a/customer_domains.php
+++ b/customer_domains.php
@@ -361,7 +361,7 @@ elseif($page == 'domains')
 	elseif($action == 'edit'
 	       && $id != 0)
 	{
-		$result = $db->query_first("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`ssl_redirect`, `d`.`aliasdomain`, `d`.`openbasedir_path` ,`pd`.`subcanemaildomain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_DOMAINS . "` `pd` WHERE `d`.`customerid`='" . (int)$userinfo['customerid'] . "' AND `d`.`id`='" . (int)$id . "' AND ((`d`.`parentdomainid`!='0' AND `pd`.`id`=`d`.`parentdomainid`) OR (`d`.`parentdomainid`='0' AND `pd`.`id`=`d`.`id`)) AND `d`.`caneditdomain`='1'");
+		$result = $db->query_first("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`ssl_redirect`, `d`.`aliasdomain`, `d`.`openbasedir_path`, `d`.`ipandport`, `pd`.`subcanemaildomain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_DOMAINS . "` `pd` WHERE `d`.`customerid`='" . (int)$userinfo['customerid'] . "' AND `d`.`id`='" . (int)$id . "' AND ((`d`.`parentdomainid`!='0' AND `pd`.`id`=`d`.`parentdomainid`) OR (`d`.`parentdomainid`='0' AND `pd`.`id`=`d`.`id`)) AND `d`.`caneditdomain`='1'");
 		$alias_check = $db->query_first('SELECT COUNT(`id`) AS count FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `aliasdomain`=\'' . (int)$result['id'] . '\'');
 		$alias_check = $alias_check['count'];
 
@@ -514,11 +514,14 @@ elseif($page == 'domains')
 				$iswildcarddomain = makeyesno('iswildcarddomain', '1', '0', $result['iswildcarddomain']);
 				$isemaildomain = makeyesno('isemaildomain', '1', '0', $result['isemaildomain']);
 				$openbasedir = makeoption($lng['domain']['docroot'], 0, $result['openbasedir_path'], true) . makeoption($lng['domain']['homedir'], 1, $result['openbasedir_path'], true);
-				$result = htmlentities_array($result);
 
-				if($settings['system']['use_ssl'] == "1")
+				$result_ipandport = $db->query_first("SELECT `ip` FROM `".TABLE_PANEL_IPSANDPORTS."` WHERE `id`='".(int)$result['ipandport']."'");
+				if(filter_var($result_ipandport['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
 				{
+					$result_ipandport['ip'] = '[' . $result_ipandport['ip'] . ']';
 				}
+				$domainip = $result_ipandport['ip'];
+				$result = htmlentities_array($result);
 
 				eval("echo \"" . getTemplate("domains/domains_edit") . "\";");
 			}
diff --git a/templates/customer/domains/domains_edit.tpl b/templates/customer/domains/domains_edit.tpl
index e51eafb6..b3642d5c 100644
--- a/templates/customer/domains/domains_edit.tpl
+++ b/templates/customer/domains/domains_edit.tpl
@@ -12,6 +12,10 @@ $header
 				<td class="main_field_name">{$lng['domains']['domainname']}:</td>
 				<td class="main_field_display" nowrap="nowrap">{$result['domain']}</td>
 			</tr>
+			<tr>
+				<td class="main_field_name">{$lng['dns']['destinationip']}:</td>
+				<td class="main_field_display" nowrap="nowrap">{$domainip}</td>
+			</tr>
 			<if $alias_check == '0'><tr>
 				<td class="main_field_name">{$lng['domains']['aliasdomain']}:</td>
 				<td class="main_field_display" nowrap="nowrap"><select class="tendina_nobordo" name="alias">$domains</select></td>