diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 660c7c840..a36db8335 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -22,8 +22,8 @@ def index
 
   def map
     @maps = Map.where(archived: false, password: '')
-               .select([:author, :name, :lat, :lon, :slug, :archived, :password])
-               .joins(:warpables, :users)
+               .select('author, maps.name, lat, lon, slug, archived, password, users.login as user_login')
+               .joins(:warpables, :user)
                .group("maps.id")
     render layout: false
   end
diff --git a/app/views/maps/map.html.erb b/app/views/maps/map.html.erb
index d5ae363ac..280f78998 100644
--- a/app/views/maps/map.html.erb
+++ b/app/views/maps/map.html.erb
@@ -27,7 +27,7 @@
       L.tileLayer("https://a.tiles.mapbox.com/v3/jywarren.map-lmrwb2em/{z}/{x}/{y}.png").addTo(map);
       <% @maps.each do |map| %>
         <% if map.lat && map.lon %>
-          L.marker([<%= map.lat %>, <%= map.lon %>]).addTo(map).bindPopup("<a href='/maps/<%= map.slug %>'><%= map.name.gsub(/\n/,'') %></a><% if map.user %> by <a href='/profile/<%= map.user.login %>'><%= map.user.login %></a><% end %>");
+          L.marker([<%= map.lat %>, <%= map.lon %>]).addTo(map).bindPopup("<a href='/maps/<%= map.slug %>'><%= map.name.gsub(/\n/,'') %></a><% if map.user_login %> by <a href='/profile/<%= map.user_login %>'><%= map.user_login %></a><% end %>");
         <% end %>
       <% end %>
       })();
diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index 7780fd981..07c83236e 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -17,6 +17,11 @@ def teardown
     assert_not_nil :maps
   end
 
+  test "should get map of maps" do
+    get :map
+    assert_response :success
+  end
+
   test "should get new" do
     get :new
     assert_response :success