diff --git a/lib/db/api.js b/lib/db/api.js
index d74ad4e9..d1e3216c 100644
--- a/lib/db/api.js
+++ b/lib/db/api.js
@@ -12,6 +12,7 @@ dbapi.close = function(options) {
 dbapi.saveUserAfterLogin = function(user) {
   return db.run(r.table('users').get(user.email).update({
       name: user.name
+    , ip: user.ip
     , lastLoggedInAt: r.now()
     }))
     .then(function(stats) {
@@ -19,6 +20,7 @@ dbapi.saveUserAfterLogin = function(user) {
         return db.run(r.table('users').insert({
           email: user.email
         , name: user.name
+        , ip: user.ip
         , group: wireutil.makePrivateChannel()
         , lastLoggedInAt: r.now()
         , createdAt: r.now()
diff --git a/lib/middleware/auth.js b/lib/middleware/auth.js
index ac5a5910..2da5c431 100644
--- a/lib/middleware/auth.js
+++ b/lib/middleware/auth.js
@@ -11,7 +11,11 @@ module.exports = function(options) {
         , redir = urlutil.removeParam(req.url, 'jwt')
       if (data) {
         // Redirect once to get rid of the token
-        dbapi.saveUserAfterLogin(data)
+        dbapi.saveUserAfterLogin({
+            name: data.name
+          , email: data.email
+          , ip: req.ip
+          })
           .then(function() {
             req.session.jwt = data
             res.redirect(redir)