diff --git a/admin_index.php b/admin_index.php
index 91836876..acee7cae 100644
--- a/admin_index.php
+++ b/admin_index.php
@@ -140,6 +140,8 @@ if ($page == 'overview') {
 	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $dec_places);
 	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
 
+	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
+
 	$cron_last_runs = getCronjobsLastRun();
 	$outstanding_tasks = getOutstandingTasks();
 
diff --git a/customer_index.php b/customer_index.php
index cea66902..68a2b664 100644
--- a/customer_index.php
+++ b/customer_index.php
@@ -85,6 +85,8 @@ if ($page == 'overview') {
 	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
 	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
 
+	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
+
 	$services_enabled = "";
 	$se = array();
 	if ($userinfo['imap'] == '1') $se[] = "IMAP";
diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl
index 554f6842..37b1f75e 100644
--- a/templates/Sparkle/admin/index/index.tpl
+++ b/templates/Sparkle/admin/index/index.tpl
@@ -180,7 +180,7 @@ $header
 				</if>
 
 				<if $userinfo['custom_notes'] != '' && $userinfo['custom_notes_show'] == '1'>
-				<table class="dboarditem full" id="customnotes">
+				<table class="dboarditem full">
 					<tbody>
 						<tr><td>{$userinfo['custom_notes']}</td></tr>
 					</tbody>