diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js.es6
new file mode 100644
index 00000000000..d93d44c9051
--- /dev/null
+++ b/app/assets/javascripts/admin/components/ip-lookup.js.es6
@@ -0,0 +1,43 @@
+export default Ember.Component.extend({
+  classNames: ["ip-lookup"],
+
+  city: function () {
+    return [
+      this.get("location.city"),
+      this.get("location.region"),
+      this.get("location.country")
+    ].filter(Boolean).join(", ");
+  }.property("location.@{city,region,country}"),
+
+  actions: {
+    lookup: function () {
+      var self = this;
+      this.set("show", true);
+
+      if (!this.get("location")) {
+        Discourse.ajax("/admin/users/ip-info.json", {
+          data: { ip: this.get("ip") }
+        }).then(function (location) {
+          self.set("location", Em.Object.create(location));
+        });
+      }
+
+      if (!this.get("other_accounts")) {
+        this.set("other_accounts_loading", true);
+        Discourse.AdminUser.findAll("active", {
+          "ip": this.get("ip"),
+          "exclude": this.get("user_id")
+        }).then(function (users) {
+          self.setProperties({
+            other_accounts: users,
+            other_accounts_loading: false,
+          });
+        });
+      }
+    },
+
+    hide: function () {
+      this.set("show", false);
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/controllers/admin_users_list_controller.js b/app/assets/javascripts/admin/controllers/admin_users_list_controller.js
index 7322aa2d9c3..5239056e108 100644
--- a/app/assets/javascripts/admin/controllers/admin_users_list_controller.js
+++ b/app/assets/javascripts/admin/controllers/admin_users_list_controller.js
@@ -91,7 +91,7 @@ Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Pres
     var adminUsersListController = this;
     adminUsersListController.set('loading', true);
 
-    Discourse.AdminUser.findAll(this.get('query'), this.get('username')).then(function (result) {
+    Discourse.AdminUser.findAll(this.get('query'), { filter: this.get('username') }).then(function (result) {
       adminUsersListController.set('content', result);
       adminUsersListController.set('loading', false);
     });
diff --git a/app/assets/javascripts/admin/models/admin_user.js b/app/assets/javascripts/admin/models/admin_user.js
index f84cc9a3bd4..981e1be3674 100644
--- a/app/assets/javascripts/admin/models/admin_user.js
+++ b/app/assets/javascripts/admin/models/admin_user.js
@@ -431,7 +431,7 @@ Discourse.AdminUser.reopenClass({
 
   findAll: function(query, filter) {
     return Discourse.ajax("/admin/users/list/" + query + ".json", {
-      data: { filter: filter }
+      data: filter
     }).then(function(users) {
       return users.map(function(u) {
         return Discourse.AdminUser.create(u);
diff --git a/app/assets/javascripts/admin/templates/ip_locator.js.handlebars b/app/assets/javascripts/admin/templates/ip_locator.js.handlebars
deleted file mode 100644
index 379e61fe7de..00000000000
--- a/app/assets/javascripts/admin/templates/ip_locator.js.handlebars
+++ /dev/null
@@ -1,54 +0,0 @@
-{{#if view.ip}}
-<button class='btn' {{action lookup target="view"}}>
-  <span class="fa fa-globe"></span> {{i18n admin.user.ip_lookup}}
-</button>
-{{/if}}
-{{#if view.showBox }}
-  <div class="location-box">
-    <h4>{{i18n ip_info.title}}</h4>
-    <dl>
-      {{#if view.location}}
-        {{#if view.location.hostname}}
-          <dt>{{i18n ip_info.hostname}}</dt>
-          <dd>{{view.location.hostname}}</dd>
-        {{/if}}
-
-        <dt>{{i18n ip_info.location}}</dt>
-        <dd>
-          {{#if view.location.loc}}
-            <a href="https://maps.google.com/maps?q={{unbound view.location.loc}}" target="_blank">{{view.location.loc}}</a><br>
-            {{view.location.city}}, {{view.location.region}}, {{view.location.country}}
-          {{else}}
-            {{i18n ip_info.location_not_found}}
-          {{/if}}
-        </dd>
-
-        {{#if view.location.org}}
-          <dt>{{i18n ip_info.organisation}}</dt>
-          <dd>{{view.location.org}}</dd>
-        {{/if}}
-
-        {{#if view.location.phone}}
-          <dt>{{i18n ip_info.phone}}</dt>
-          <dd>{{view.location.phone}}</dd>
-        {{/if}}
-      {{else}}
-        <div class='spinner'>{{i18n loading}}</div>
-      {{/if}}
-
-      <dt>{{i18n ip_info.other_accounts}}</dt>
-      <dd>
-        {{#if view.other_accounts_loading}}
-          {{i18n loading}}
-        {{else}}
-          {{#each view.other_accounts}}
-              {{#link-to 'adminUser' this}}{{avatar this usernamePath="user.username" imageSize="small"}}{{/link-to}}
-          {{else}}
-            {{i18n ip_info.no_other_accounts}}
-          {{/each}}
-        {{/if}}
-      <dd>
-    </dl>
-    <button class='btn close' {{action hideBox target="view" }}>{{i18n close}}</button>
-  </div>
-{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/templates/user_index.js.handlebars b/app/assets/javascripts/admin/templates/user_index.js.handlebars
index e3a8d41ef9e..b7f7cd69d71 100644
--- a/app/assets/javascripts/admin/templates/user_index.js.handlebars
+++ b/app/assets/javascripts/admin/templates/user_index.js.handlebars
@@ -76,10 +76,10 @@
     <div class='value'>{{ip_address}}</div>
     <div class='controls'>
       {{#if currentUser.admin}}
-      <button class='btn' {{action refreshBrowsers target="content"}}>
-        {{i18n admin.user.refresh_browsers}}
-      </button>
-        {{view Discourse.AdminIpLocatorView ipBinding="ip_address"}}
+        <button class='btn' {{action refreshBrowsers target="content"}}>
+          {{i18n admin.user.refresh_browsers}}
+        </button>
+        {{ip-lookup ip=ip_address user_id=id}}
       {{/if}}
     </div>
   </div>
@@ -89,7 +89,7 @@
     <div class='value'>{{registration_ip_address}}</div>
     <div class='controls'>
       {{#if currentUser.admin}}
-        {{view Discourse.AdminIpLocatorView ipBinding="registration_ip_address"}}
+        {{ip-lookup ip=registration_ip_address user_id=id}}
       {{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.js.handlebars b/app/assets/javascripts/discourse/templates/components/ip-lookup.js.handlebars
new file mode 100644
index 00000000000..30dec03a34b
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.js.handlebars
@@ -0,0 +1,54 @@
+{{#if ip}}
+  <button class="btn" {{action lookup}}>
+    <span class="fa fa-globe"></span>&nbsp;{{i18n admin.user.ip_lookup}}
+  </button>
+{{/if}}
+{{#if show}}
+  <div class="location-box">
+    <h4>{{i18n ip_lookup.title}}</h4>
+    <dl>
+      {{#if location}}
+        {{#if location.hostname}}
+          <dt>{{i18n ip_lookup.hostname}}</dt>
+          <dd>{{location.hostname}}</dd>
+        {{/if}}
+
+        <dt>{{i18n ip_lookup.location}}</dt>
+        <dd>
+          {{#if location.loc}}
+            <a href="https://maps.google.com/maps?q={{unbound location.loc}}" target="_blank">{{location.loc}}</a><br>
+            {{city}}
+          {{else}}
+            {{i18n ip_lookup.location_not_found}}
+          {{/if}}
+        </dd>
+
+        {{#if location.org}}
+          <dt>{{i18n ip_lookup.organisation}}</dt>
+          <dd>{{location.org}}</dd>
+        {{/if}}
+
+        {{#if location.phone}}
+          <dt>{{i18n ip_lookup.phone}}</dt>
+          <dd>{{location.phone}}</dd>
+        {{/if}}
+      {{else}}
+        <div class="spinner">{{i18n loading}}</div>
+      {{/if}}
+
+      <dt>{{i18n ip_lookup.other_accounts}}</dt>
+      <dd>
+        {{#if other_accounts_loading}}
+          <div class="spinner">{{i18n loading}}</div>
+        {{else}}
+          {{#each other_accounts}}
+            {{#link-to "adminUser" this}}{{avatar this usernamePath="user.username" imageSize="small"}}{{/link-to}}
+          {{else}}
+            {{i18n ip_lookup.no_other_accounts}}
+          {{/each}}
+        {{/if}}
+      <dd>
+    </dl>
+    <button class="btn close" {{action hide}}>{{i18n close}}</button>
+  </div>
+{{/if}}
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index d92c4a27500..0d719b29950 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -86,7 +86,7 @@ td.flaggers td {
   };
 }
 
-.iplocator {
+.ip-lookup {
   position: relative;
   display: inline-block;
 
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index f4ab08ed95d..e5fd6d1ae8f 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -183,6 +183,15 @@ class Admin::UsersController < Admin::AdminController
   def leader_requirements
   end
 
+  def ip_info
+    params.require(:ip)
+    ip = params[:ip]
+
+    # should we cache results in redis?
+    location = Excon.get("http://ipinfo.io/#{ip}/json", read_timeout: 30, connect_timeout: 30).body rescue nil
+
+    render json: location
+  end
 
   private
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f756cd57662..14b8eaf4dd6 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -240,7 +240,7 @@ en:
         one: "%{count} new post in the past %{unit}."
         other: "%{count} new posts in the past %{unit}."
 
-    ip_info:
+    ip_lookup:
       title: IP Address Lookup
       hostname: Hostname
       location: Location
diff --git a/config/routes.rb b/config/routes.rb
index 34d929fc0b8..8d968fb7f92 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -48,6 +48,7 @@ Discourse::Application.routes.draw do
     resources :users, id: USERNAME_ROUTE_FORMAT do
       collection do
         get "list/:query" => "users#index"
+        get "ip-info" => "users#ip_info"
         put "approve-bulk" => "users#approve_bulk"
         delete "reject-bulk" => "users#reject_bulk"
       end
diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index d59ab466c5b..2b07fb20960 100644
--- a/lib/admin_user_index_query.rb
+++ b/lib/admin_user_index_query.rb
@@ -40,7 +40,6 @@ class AdminUserIndexQuery
     end
   end
 
-
   def filter_by_ip
     if params[:ip].present?
       @query.where('ip_address = :ip or registration_ip_address = :ip', ip: params[:ip])
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index b974dbc6390..ba4dcc65fe8 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -371,6 +371,15 @@ describe Admin::UsersController do
       end
     end
 
+    context 'ip-info' do
+
+      it "uses ipinfo.io webservice to retrieve the info" do
+        Excon.expects(:get).with("http://ipinfo.io/123.123.123.123/json", read_timeout: 30, connect_timeout: 30)
+        xhr :get, :ip_info, ip: "123.123.123.123"
+      end
+
+    end
+
   end
 
 end