diff --git a/inc/display.php b/inc/display.php
index 1b5e98f7..ab6f9cda 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -230,13 +230,11 @@
 					' style="' . $config['custom_capcode'][$this->capcode][2] . '"'
 				: '')
 			. '>'.$this->trip.'</span>':'')
+			// End email
+			. (!empty($this->email)? '</a>' : '')
 			// Capcode
 			. (!empty($this->capcode) ? capcode($this->capcode) : '');
 			
-			// End email
-			if(!empty($this->email))
-				$built .= '</a>';
-			
 			// IP Address
 			if($this->mod && $this->mod['type'] >= $config['mod']['show_ip']) {
 				$built .= ' [<a style="margin:0;" href="?/IP/' . $this->ip . '">' . $this->ip . '</a>]';
@@ -415,13 +413,11 @@
 			$built .= '<span class="name">' . $this->name . '</span>'
 			// Trip
 			. (!empty($this->trip) ? ' <span class="trip">'.$this->trip.'</span>':'')
+			// End email
+			. (!empty($this->email)? '</a>' : '')
 			// Capcode
 			. (!empty($this->capcode) ? capcode($this->capcode) : '');
 			
-			// End email
-			if(!empty($this->email))
-				$built .= '</a>';
-			
 			// IP Address
 			if($this->mod && $this->mod['type'] >= $config['mod']['show_ip']) {
 				$built .= ' [<a style="margin:0;" href="?/IP/' . $this->ip . '">' . $this->ip . '</a>]';