diff --git a/library/attach_mod/displaying_torrent.php b/library/attach_mod/displaying_torrent.php
index a4364d750..442ac634f 100644
--- a/library/attach_mod/displaying_torrent.php
+++ b/library/attach_mod/displaying_torrent.php
@@ -383,7 +383,9 @@ if ($tor_reged && $tor_info) {
                 // Full details mode
                 if ($s_mode == 'full') {
                     if (!empty($peer['ip']) && !empty($peer['ipv6'])) {
-                        $ip = bt_show_ip($peer['ipv6']) . ' (' . bt_show_ip($peer['ip']) . ')';
+                        if ($ip = bt_show_ip($peer['ipv6'])) {
+                            $ip .= ' (' . bt_show_ip($peer['ip']) . ')';
+                        }
                     } else {
                         $ip = bt_show_ip(!empty($peer['ipv6']) ? $peer['ipv6'] : $peer['ip']);
                     }
@@ -492,7 +494,10 @@ if ($tor_reged && $tor_info) {
                     ]);
 
                     if ($ip) {
-                        $template->assign_block_vars("$x_full.$x_row.ip", ['IP' => $ip]);
+                        $template->assign_block_vars("$x_full.$x_row.ip", [
+                            'U_WHOIS_IP' => $bb_cfg['whois_info'] . $ip,
+                            'IP' => $ip
+                        ]);
                     }
                     if ($port !== false) {
                         $template->assign_block_vars("$x_full.$x_row.port", ['PORT' => $port]);
diff --git a/styles/templates/default/viewtopic_torrent.tpl b/styles/templates/default/viewtopic_torrent.tpl
index 88a87f67f..8717bcd5c 100644
--- a/styles/templates/default/viewtopic_torrent.tpl
+++ b/styles/templates/default/viewtopic_torrent.tpl
@@ -167,7 +167,7 @@ ajax.callback.callseed = function (data) {
 				<td class="seedmed"><u>{sfull.srow.SPEED_UP_RAW}</u>{sfull.srow.SPEED_UP}</td>
 				<td class="leechmed"><u>{sfull.srow.SPEED_DOWN_RAW}</u>{sfull.srow.SPEED_DOWN}</td>
 				<!-- BEGIN ip -->
-				<td>{sfull.srow.ip.IP}</td>
+                <td><a href="{sfull.srow.ip.U_WHOIS_IP}" target="_blank">{sfull.srow.ip.IP}</a></td>
 				<!-- END ip -->
 				<!-- BEGIN port -->
 				<td>{sfull.srow.port.PORT}</td>
@@ -220,7 +220,7 @@ ajax.callback.callseed = function (data) {
 				<td class="seedmed"><u>{lfull.lrow.SPEED_UP_RAW}</u>{lfull.lrow.SPEED_UP}</td>
 				<td class="leechmed"><u>{lfull.lrow.SPEED_DOWN_RAW}</u>{lfull.lrow.SPEED_DOWN}</td>
 				<!-- BEGIN ip -->
-				<td>{lfull.lrow.ip.IP}</td>
+                <td><a href="{lfull.lrow.ip.U_WHOIS_IP}" target="_blank">{lfull.lrow.ip.IP}</a></td>
 				<!-- END ip -->
 				<!-- BEGIN port -->
 				<td>{lfull.lrow.port.PORT}</td>