diff --git a/css/app.css b/css/app.css
index e297596bc..db2eed63c 100644
--- a/css/app.css
+++ b/css/app.css
@@ -572,6 +572,10 @@ img.tile {
     padding:2px 5px;
 }
 
+#about #user-list a:not(:last-child):after {
+    content: ', ';
+}
+
 /* Account Information
 ------------------------------------------------------- */
 
diff --git a/js/id/id.js b/js/id/id.js
index 8a65570e4..853d258c8 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -47,7 +47,7 @@ window.iD = function(container) {
 
         var showUsers = _.debounce(function() {
             var users = {},
-                entities = map.history().graph().entities;
+                entities = map.history().graph().intersects(map.extent());
             for (var i in entities) {
                 users[entities[i].user] = true;
                 if (Object.keys(users).length > 10) break;
@@ -172,7 +172,9 @@ window.iD = function(container) {
                   " <a href='http://opengeodata.org/microsoft-imagery-details'><img src='img/bing.png' /></a>");
 
         about.append('div')
-            .attr('id', 'user-list');
+            .attr('id', 'user-list')
+            .append('span')
+            .text('edited by ');
 
         history.on('change.buttons', function() {
             var undo = history.undoAnnotation(),