diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 272420194..995114e40 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -107,7 +107,7 @@ class DataStore(RoomMemberStore, RoomStore,
         yield self._simple_upsert(
             "user_ips",
             keyvalues={
-                "user": user.to_string(),
+                "user_id": user.to_string(),
                 "access_token": access_token,
                 "ip": ip,
                 "user_agent": user_agent,
@@ -122,7 +122,7 @@ class DataStore(RoomMemberStore, RoomStore,
     def get_user_ip_and_agents(self, user):
         return self._simple_select_list(
             table="user_ips",
-            keyvalues={"user": user.to_string()},
+            keyvalues={"user_id": user.to_string()},
             retcols=[
                 "device_id", "access_token", "ip", "user_agent", "last_seen"
             ],
diff --git a/synapse/storage/schema/delta/16/users.sql b/synapse/storage/schema/delta/16/users.sql
index f04705cd7..db27bdca0 100644
--- a/synapse/storage/schema/delta/16/users.sql
+++ b/synapse/storage/schema/delta/16/users.sql
@@ -36,7 +36,7 @@ ALTER TABLE new_users RENAME TO users;
 
 -- Remove UNIQUE constraint from `user_ips` table
 CREATE TABLE IF NOT EXISTS new_user_ips (
-    user VARCHAR(150) NOT NULL,
+    user_id VARCHAR(150) NOT NULL,
     access_token VARCHAR(150) NOT NULL,
     device_id VARCHAR(150),
     ip VARCHAR(150) NOT NULL,
@@ -51,6 +51,6 @@ DROP TABLE user_ips;
 
 ALTER TABLE new_user_ips RENAME TO user_ips;
 
-CREATE INDEX IF NOT EXISTS user_ips_user ON user_ips(user);
-CREATE INDEX IF NOT EXISTS user_ips_user_ip ON user_ips(user, access_token, ip);
+CREATE INDEX IF NOT EXISTS user_ips_user ON user_ips(user_id);
+CREATE INDEX IF NOT EXISTS user_ips_user_ip ON user_ips(user_id, access_token, ip);
 
diff --git a/synapse/storage/schema/full_schemas/16/users.sql b/synapse/storage/schema/full_schemas/16/users.sql
index 267284d07..006b249fc 100644
--- a/synapse/storage/schema/full_schemas/16/users.sql
+++ b/synapse/storage/schema/full_schemas/16/users.sql
@@ -30,7 +30,7 @@ CREATE TABLE IF NOT EXISTS access_tokens(
 );
 
 CREATE TABLE IF NOT EXISTS user_ips (
-    user VARCHAR(150) NOT NULL,
+    user_id VARCHAR(150) NOT NULL,
     access_token VARCHAR(150) NOT NULL,
     device_id VARCHAR(150),
     ip VARCHAR(150) NOT NULL,
@@ -38,5 +38,5 @@ CREATE TABLE IF NOT EXISTS user_ips (
     last_seen BIGINT NOT NULL
 );
 
-CREATE INDEX IF NOT EXISTS user_ips_user ON user_ips(user);
-CREATE INDEX IF NOT EXISTS user_ips_user_ip ON user_ips(user, access_token, ip);
+CREATE INDEX user_ips_user ON user_ips(user_id);
+CREATE INDEX user_ips_user_ip ON user_ips(user_id, access_token, ip);