diff --git a/plugins/Mapstraction/usermap.js b/plugins/Mapstraction/usermap.js
index 41bdb677b4..3a1379b8d4 100644
--- a/plugins/Mapstraction/usermap.js
+++ b/plugins/Mapstraction/usermap.js
@@ -32,8 +32,10 @@ $(document).ready(function() {
           pt = new mxn.LatLonPoint(lat, lon);
           mkr = new mxn.Marker(pt);
 
+          mkr.setLabel();
           mkr.setIcon(n['user']['profile_image_url']);
-          mkr.setInfoBubble(n['html']);
+          mkr.setInfoBubble('<a href="'+ n['user']['profile_url'] + '">' + n['user']['screen_name'] + '</a>' + ' ' + n['html'] +
+                            '<br/><a href="'+ n['url'] + '">'+ n['created_at'] + '</a>');
 
           mapstraction.addMarker(mkr);
      }