diff --git a/course/lib.php b/course/lib.php
index 4e05ba127b6f2..697fc72ee500a 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -159,7 +159,7 @@ function print_log($course, $user=0, $date=0, $order="ORDER BY l.time ASC") {
         echo "<TD NOWRAP ALIGN=right><FONT SIZE=2>".userdate($log->time, "%A")."</TD>";
         echo "<TD NOWRAP><FONT SIZE=2>".userdate($log->time, "%e %B %Y, %I:%M %p")."</TD>";
         echo "<TD NOWRAP><FONT SIZE=2>";
-        link_to_popup_window("$CFG->wwwroot/lib/ipatlas/plot.php?address=$log->ip", "ipatlas","$log->ip", 400, 600);
+        link_to_popup_window("$CFG->wwwroot/lib/ipatlas/plot.php?address=$log->ip&user=$log->user", "ipatlas","$log->ip", 400, 600);
         echo "</TD>";
         echo "<TD NOWRAP><FONT SIZE=2><A HREF=\"../user/view.php?id=$log->user&course=$log->course\"><B>$log->firstname $log->lastname</B></TD>";
         echo "<TD NOWRAP><FONT SIZE=2>";
diff --git a/lib/ipatlas/plot.php b/lib/ipatlas/plot.php
index a37256924e392..7b5e4542764da 100644
--- a/lib/ipatlas/plot.php
+++ b/lib/ipatlas/plot.php
@@ -3,6 +3,11 @@
 include("plotconf.inc");
 include("plot.inc");
 
+if (isset($user)) {
+    $user = get_record("user", "id", $user);
+    $username = "<B>$user->firstname $user->lastname</B>";
+}
+
 if($warnings == "1") {
 error_reporting(E_ALL);
 } else {
@@ -105,7 +110,7 @@
 ';
 
 if(isset($address)) {
-print "$values[desc]";
+print "$username, $values[desc]";
 }
 
 $PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];