diff --git a/userapi/storage/postgres/account_data_table.go b/userapi/storage/postgres/account_data_table.go
index 0b6a3af6d..4fb44aab3 100644
--- a/userapi/storage/postgres/account_data_table.go
+++ b/userapi/storage/postgres/account_data_table.go
@@ -29,6 +29,7 @@ const accountDataSchema = `
 CREATE TABLE IF NOT EXISTS userapi_account_datas (
     -- The Matrix user ID localpart for this account
     localpart TEXT NOT NULL,
+	server_name TEXT NOT NULL,
     -- The room ID for this data (empty string if not specific to a room)
     room_id TEXT,
     -- The account data type
diff --git a/userapi/storage/postgres/accounts_table.go b/userapi/storage/postgres/accounts_table.go
index 7c309eb4f..1448c888b 100644
--- a/userapi/storage/postgres/accounts_table.go
+++ b/userapi/storage/postgres/accounts_table.go
@@ -35,6 +35,7 @@ const accountsSchema = `
 CREATE TABLE IF NOT EXISTS userapi_accounts (
     -- The Matrix user ID localpart for this account
     localpart TEXT NOT NULL PRIMARY KEY,
+	server_name TEXT NOT NULL,
     -- When this account was first created, as a unix timestamp (ms resolution).
     created_ts BIGINT NOT NULL,
     -- The password hash for this account. Can be NULL if this is a passwordless account.
diff --git a/userapi/storage/postgres/devices_table.go b/userapi/storage/postgres/devices_table.go
index 8b7fbd6cf..3982d1f21 100644
--- a/userapi/storage/postgres/devices_table.go
+++ b/userapi/storage/postgres/devices_table.go
@@ -50,6 +50,7 @@ CREATE TABLE IF NOT EXISTS userapi_devices (
     -- as it is smaller, makes it clearer that we only manage devices for our own users, and may make
     -- migration to different domain names easier.
     localpart TEXT NOT NULL,
+	server_name TEXT NOT NULL,
     -- When this devices was first recognised on the network, as a unix timestamp (ms resolution).
     created_ts BIGINT NOT NULL,
     -- The display name, human friendlier than device_id and updatable
diff --git a/userapi/storage/postgres/notifications_table.go b/userapi/storage/postgres/notifications_table.go
index 24a30b2f5..641f521c7 100644
--- a/userapi/storage/postgres/notifications_table.go
+++ b/userapi/storage/postgres/notifications_table.go
@@ -43,6 +43,7 @@ const notificationSchema = `
 CREATE TABLE IF NOT EXISTS userapi_notifications (
     id BIGSERIAL PRIMARY KEY,
 	localpart TEXT NOT NULL,
+	server_name TEXT NOT NULL,
 	room_id TEXT NOT NULL,
 	event_id TEXT NOT NULL,
 	stream_pos BIGINT NOT NULL,
diff --git a/userapi/storage/postgres/openid_table.go b/userapi/storage/postgres/openid_table.go
index 06ae30d08..1beac9757 100644
--- a/userapi/storage/postgres/openid_table.go
+++ b/userapi/storage/postgres/openid_table.go
@@ -18,6 +18,7 @@ CREATE TABLE IF NOT EXISTS userapi_openid_tokens (
 	token TEXT NOT NULL PRIMARY KEY,
     -- The Matrix user ID for this account
 	localpart TEXT NOT NULL,
+	server_name TEXT NOT NULL,
 	-- When the token expires, as a unix timestamp (ms resolution).
 	token_expires_at_ms BIGINT NOT NULL
 );
diff --git a/userapi/storage/postgres/profile_table.go b/userapi/storage/postgres/profile_table.go
index 2753b23d9..2511f32ca 100644
--- a/userapi/storage/postgres/profile_table.go
+++ b/userapi/storage/postgres/profile_table.go
@@ -30,6 +30,7 @@ const profilesSchema = `
 CREATE TABLE IF NOT EXISTS userapi_profiles (
     -- The Matrix user ID localpart for this account
     localpart TEXT NOT NULL PRIMARY KEY,
+	server_name TEXT NOT NULL,
     -- The display name for this account
     display_name TEXT,
     -- The URL of the avatar for this account
diff --git a/userapi/storage/postgres/pusher_table.go b/userapi/storage/postgres/pusher_table.go
index 6fb714fba..b606bca00 100644
--- a/userapi/storage/postgres/pusher_table.go
+++ b/userapi/storage/postgres/pusher_table.go
@@ -33,6 +33,7 @@ CREATE TABLE IF NOT EXISTS userapi_pushers (
 	id BIGSERIAL PRIMARY KEY,
 	-- The Matrix user ID localpart for this pusher
 	localpart TEXT NOT NULL,
+	server_name TEXT NOT NULL,
 	session_id BIGINT DEFAULT NULL,
 	profile_tag TEXT,
 	kind TEXT NOT NULL,
diff --git a/userapi/storage/postgres/threepid_table.go b/userapi/storage/postgres/threepid_table.go
index 11af76161..593e53148 100644
--- a/userapi/storage/postgres/threepid_table.go
+++ b/userapi/storage/postgres/threepid_table.go
@@ -33,6 +33,7 @@ CREATE TABLE IF NOT EXISTS userapi_threepids (
 	medium TEXT NOT NULL DEFAULT 'email',
 	-- The localpart of the Matrix user ID associated to this 3PID
 	localpart TEXT NOT NULL,
+	server_name TEXT NOT NULL,
 
 	PRIMARY KEY(threepid, medium)
 );
diff --git a/userapi/storage/sqlite3/account_data_table.go b/userapi/storage/sqlite3/account_data_table.go
index af12decb3..7ca004ab1 100644
--- a/userapi/storage/sqlite3/account_data_table.go
+++ b/userapi/storage/sqlite3/account_data_table.go
@@ -28,6 +28,7 @@ const accountDataSchema = `
 CREATE TABLE IF NOT EXISTS userapi_account_datas (
     -- The Matrix user ID localpart for this account
     localpart TEXT NOT NULL,
+	server_name TEXT NOT NULL,
     -- The room ID for this data (empty string if not specific to a room)
     room_id TEXT,
     -- The account data type
diff --git a/userapi/storage/sqlite3/accounts_table.go b/userapi/storage/sqlite3/accounts_table.go
index 671c1aa04..ae82503de 100644
--- a/userapi/storage/sqlite3/accounts_table.go
+++ b/userapi/storage/sqlite3/accounts_table.go
@@ -35,6 +35,7 @@ const accountsSchema = `
 CREATE TABLE IF NOT EXISTS userapi_accounts (
     -- The Matrix user ID localpart for this account
     localpart TEXT NOT NULL PRIMARY KEY,
+	server_name TEXT NOT NULL,
     -- When this account was first created, as a unix timestamp (ms resolution).
     created_ts BIGINT NOT NULL,
     -- The password hash for this account. Can be NULL if this is a passwordless account.
diff --git a/userapi/storage/sqlite3/devices_table.go b/userapi/storage/sqlite3/devices_table.go
index e53a08062..69bb86060 100644
--- a/userapi/storage/sqlite3/devices_table.go
+++ b/userapi/storage/sqlite3/devices_table.go
@@ -40,6 +40,7 @@ CREATE TABLE IF NOT EXISTS userapi_devices (
     session_id INTEGER,
     device_id TEXT ,
     localpart TEXT ,
+	server_name TEXT NOT NULL,
     created_ts BIGINT,
     display_name TEXT,
     last_seen_ts BIGINT,
diff --git a/userapi/storage/sqlite3/notifications_table.go b/userapi/storage/sqlite3/notifications_table.go
index a35ec7be5..98bb7d9fd 100644
--- a/userapi/storage/sqlite3/notifications_table.go
+++ b/userapi/storage/sqlite3/notifications_table.go
@@ -43,6 +43,7 @@ const notificationSchema = `
 CREATE TABLE IF NOT EXISTS userapi_notifications (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
 	localpart TEXT NOT NULL,
+	server_name TEXT NOT NULL,
 	room_id TEXT NOT NULL,
 	event_id TEXT NOT NULL,
 	stream_pos BIGINT NOT NULL,
diff --git a/userapi/storage/sqlite3/openid_table.go b/userapi/storage/sqlite3/openid_table.go
index 875f1a9a5..0e334f481 100644
--- a/userapi/storage/sqlite3/openid_table.go
+++ b/userapi/storage/sqlite3/openid_table.go
@@ -18,6 +18,7 @@ CREATE TABLE IF NOT EXISTS userapi_openid_tokens (
 	token TEXT NOT NULL PRIMARY KEY,
     -- The Matrix user ID for this account
 	localpart TEXT NOT NULL,
+	server_name TEXT NOT NULL,
 	-- When the token expires, as a unix timestamp (ms resolution).
 	token_expires_at_ms BIGINT NOT NULL
 );
diff --git a/userapi/storage/sqlite3/profile_table.go b/userapi/storage/sqlite3/profile_table.go
index b6130a1e3..679ffd32d 100644
--- a/userapi/storage/sqlite3/profile_table.go
+++ b/userapi/storage/sqlite3/profile_table.go
@@ -30,6 +30,7 @@ const profilesSchema = `
 CREATE TABLE IF NOT EXISTS userapi_profiles (
     -- The Matrix user ID localpart for this account
     localpart TEXT NOT NULL PRIMARY KEY,
+	server_name TEXT NOT NULL,
     -- The display name for this account
     display_name TEXT,
     -- The URL of the avatar for this account
diff --git a/userapi/storage/sqlite3/pusher_table.go b/userapi/storage/sqlite3/pusher_table.go
index 4de0a9f06..14f993673 100644
--- a/userapi/storage/sqlite3/pusher_table.go
+++ b/userapi/storage/sqlite3/pusher_table.go
@@ -33,6 +33,7 @@ CREATE TABLE IF NOT EXISTS userapi_pushers (
 	id INTEGER PRIMARY KEY AUTOINCREMENT,
 	-- The Matrix user ID localpart for this pusher
 	localpart TEXT NOT NULL,
+	server_name TEXT NOT NULL,
 	session_id BIGINT DEFAULT NULL,
 	profile_tag TEXT,
 	kind TEXT NOT NULL,
diff --git a/userapi/storage/sqlite3/threepid_table.go b/userapi/storage/sqlite3/threepid_table.go
index 73af139db..683d8ecad 100644
--- a/userapi/storage/sqlite3/threepid_table.go
+++ b/userapi/storage/sqlite3/threepid_table.go
@@ -34,6 +34,7 @@ CREATE TABLE IF NOT EXISTS userapi_threepids (
 	medium TEXT NOT NULL DEFAULT 'email',
 	-- The localpart of the Matrix user ID associated to this 3PID
 	localpart TEXT NOT NULL,
+	server_name TEXT NOT NULL,
 
 	PRIMARY KEY(threepid, medium)
 );