diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index eb4217fb5c..0f1ccafe38 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -173,7 +173,6 @@ define('TOPICS_WATCH_TABLE', $table_prefix.'topics_watch');
 define('TOPICS_TRACK_TABLE', $table_prefix.'topics_marking');
 define('USER_GROUP_TABLE', $table_prefix.'user_group');
 define('USERS_TABLE', $table_prefix.'users');
-define('USERS_PASSWD_TABLE', $table_prefix.'users_passwd');
 define('USERS_NOTES_TABLE', $table_prefix.'users_notes');
 define('WARNINGS_TABLE', $table_prefix.'warnings');
 define('WORDS_TABLE', $table_prefix.'words');
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 5706fa03d2..74d8c64965 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -805,13 +805,6 @@ CREATE TABLE phpbb_users (
   user_newpasswd VARCHAR(32) NOT NULL
 );;
 
-# phpbb_users_passwd
-CREATE TABLE phpbb_users_passwd (
-  user_id INTEGER NOT NULL,
-  passwd_time INTEGER NOT NULL,
-  passwd VARCHAR(32) NOT NULL
-);;
-
 # phpbb_words
 CREATE TABLE phpbb_words (
   word_id INTEGER NOT NULL,
@@ -1466,16 +1459,6 @@ ON phpbb_sessions_keys(
   last_login
 );;
 
-ALTER TABLE phpbb_users_passwd
-ADD PRIMARY KEY (
-  user_id
-);;
-
-CREATE INDEX passwd_time83
-ON phpbb_users_passwd(
-  passwd_time
-);;
-
 CREATE GENERATOR G_phpbb_attachmentsattach_idGen;;
 
 SET GENERATOR G_phpbb_attachmentsattach_idGen TO 0;;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index f8c1f3ded2..9a877e785c 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -809,13 +809,6 @@ CREATE TABLE [phpbb_users] (
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
-CREATE TABLE [phpbb_users_passwd] (
-	[user_id] [int] NOT NULL ,
-	[passwd_time] [int] NOT NULL ,
-	[passwd] [varchar] (32) NOT NULL 
-) ON [PRIMARY]
-GO
-
 CREATE TABLE [phpbb_words] (
 	[word_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[word] [varchar] (100) NOT NULL ,
@@ -1163,13 +1156,6 @@ ALTER TABLE [phpbb_users] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
-ALTER TABLE [phpbb_users_passwd] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_users_passwd] PRIMARY KEY  CLUSTERED 
-	(
-		[user_id]
-	)  ON [PRIMARY] 
-GO
-
 ALTER TABLE [phpbb_words] WITH NOCHECK ADD 
 	CONSTRAINT [PK_phpbb_words] PRIMARY KEY  CLUSTERED 
 	(
@@ -1636,12 +1622,6 @@ ALTER TABLE [phpbb_users] WITH NOCHECK ADD
 	CONSTRAINT [DF_users__user_sig_bbcode_bitf] DEFAULT (0) FOR [user_sig_bbcode_bitfield]
 GO
 
-ALTER TABLE [phpbb_users_passwd] WITH NOCHECK ADD 
-	CONSTRAINT [DF_users_pwd_user_id] DEFAULT (0) FOR [user_id],
-	CONSTRAINT [DF_users_pwd_passwd_time] DEFAULT (0) FOR [passwd_time],
-	CONSTRAINT [DF_users_pwd_passwd] DEFAULT ('0') FOR [passwd]
-GO
-
 ALTER TABLE [phpbb_zebra] WITH NOCHECK ADD 
 	CONSTRAINT [DF_zebra__user_id] DEFAULT (0) FOR [user_id],
 	CONSTRAINT [DF_zebra__zebra_id] DEFAULT (0) FOR [zebra_id],
@@ -1889,9 +1869,6 @@ GO
 CREATE  INDEX [username] ON [phpbb_users]([username]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [passwd_time] ON [phpbb_users_passwd]([passwd_time]) ON [PRIMARY]
-GO
-
 CREATE  INDEX [user_id] ON [phpbb_zebra]([user_id]) ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 1984f3e985..13c914ff51 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -931,15 +931,6 @@ CREATE TABLE phpbb_users (
    KEY username (username)
 );
 
-# Table: 'phpbb_users_passwd'
-CREATE TABLE phpbb_users_passwd (
-  user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-  passwd_time int(11) DEFAULT '0' NOT NULL, 
-  passwd varchar(32) DEFAULT '' NOT NULL,
-  PRIMARY KEY  (user_id),
-  KEY passwd_time (passwd_time)
-);
-
 # Table: 'phpbb_warnings'
 CREATE TABLE phpbb_warnings (
   warning_id mediumint(8) unsigned NOT NULL auto_increment,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index eb0ab820e6..791ede23bd 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1728,20 +1728,6 @@ CREATE INDEX user_email_hash on phpbb_users (user_email_hash)
 CREATE INDEX username on phpbb_users (username)
 /
 
-/*
- Table: phpbb_users_passwd
-*/
-CREATE TABLE phpbb_users_passwd (
-  user_id number(8) NOT NULL,
-  passwd_time number(11) DEFAULT '0' NOT NULL,
-  passwd varchar2(32),
-  CONSTRAINT pk_phpbb_users_passwd PRIMARY KEY (user_id)
-)
-/
-
-CREATE INDEX passwd_time on phpbb_users_passwd (passwd_time)
-/
-
 /*
  Table: phpbb_words
 */
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 5f99762ed9..98c335644f 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -1228,16 +1228,6 @@ CREATE INDEX username_phpbb_users_index ON phpbb_users (username);
 
 SELECT SETVAL('phpbb_users_user_id_seq',(select case when max(user_id)>0 then max(user_id)+1 else 1 end from phpbb_users));
 
-/* Table: phpbb_users_passwd */
-CREATE TABLE phpbb_users_passwd (
-  user_id INT4 DEFAULT '0' NOT NULL,
-  passwd_time INT4 DEFAULT '0' NOT NULL, 
-  passwd varchar(32) DEFAULT '' NOT NULL,
-  PRIMARY KEY (user_id)
-);
-
-CREATE INDEX passwd_time_phpbb_users_passwd_index ON phpbb_users_passwd (passwd_time);
-
 /* Table: phpbb_words */
 CREATE SEQUENCE phpbb_words_word_id_seq;
 
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index a8ecce69eb..3020dc3db0 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -934,15 +934,6 @@ CREATE INDEX user_birthday_phpbb_users on phpbb_users (user_birthday);
 CREATE INDEX user_email_hash_phpbb_users on phpbb_users (user_email_hash);
 CREATE INDEX username_phpbb_users on phpbb_users (username);
 
-# Table: phpbb_users_passwd
-CREATE TABLE phpbb_users_passwd (
-  user_id INTEGER PRIMARY KEY NOT NULL,
-  passwd_time int(11) NOT NULL DEFAULT '0', 
-  passwd varchar(32) NOT NULL DEFAULT '',
-);
-
-CREATE INDEX passwd_time_phpbb_users_passwd on phpbb_users_passwd (passwd_time);
-
 # Table: phpbb_words
 CREATE TABLE phpbb_words (
   word_id INTEGER PRIMARY KEY NOT NULL,