diff --git a/install/update-6.1.0/update-postgres.sql b/install/update-6.1.0/update-postgres.sql
index 408a969b5..c6605a4dd 100644
--- a/install/update-6.1.0/update-postgres.sql
+++ b/install/update-6.1.0/update-postgres.sql
@@ -2,6 +2,10 @@ START TRANSACTION;
 
 ALTER TABLE "tblUsers" ALTER COLUMN "pwd" TYPE varchar(255) DEFAULT NULL;
 
+ALTER TABLE "tblUserPasswordHistory" ALTER COLUMN "pwd" varchar(255) DEFAULT NULL;
+
+ALTER TABLE "tblUserPasswordRequest" ALTER COLUMN "hash" varchar(255) DEFAULT NULL;
+
 ALTER TABLE "tblUsers" ADD COLUMN "webauthn" TYPE varchar(1024) DEFAULT NULL;
 
 CREATE TABLE "tblAttributeDefinitionGroups" (
diff --git a/install/update-6.1.0/update-sqlite3.sql b/install/update-6.1.0/update-sqlite3.sql
index 357968a64..f0ecde747 100644
--- a/install/update-6.1.0/update-sqlite3.sql
+++ b/install/update-6.1.0/update-sqlite3.sql
@@ -27,6 +27,32 @@ DROP TABLE `tblUsers`;
 
 ALTER TABLE `new_tblUsers` RENAME TO `tblUsers`;
 
+CREATE TABLE `new_tblUserPasswordRequest` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  `hash` varchar(255) default NULL,
+  `date` TEXT NOT NULL
+);
+
+INSERT INTO `new_tblUserPasswordRequest` SELECT * FROM `tblUserPasswordRequest`;
+
+DROP TABLE `tblUserPasswordRequest`;
+
+ALTER TABLE `new_tblUserPasswordRequest` RENAME TO `tblUserPasswordRequest`;
+
+CREATE TABLE `new_tblUserPasswordHistory` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  `pwd` varchar(255) default NULL,
+  `date` TEXT NOT NULL
+);
+
+INSERT INTO `new_tblUserPasswordHistory` SELECT * FROM `tblUserPasswordHistory`;
+
+DROP TABLE `tblUserPasswordHistory`;
+
+ALTER TABLE `new_tblUserPasswordHistory` RENAME TO `tblUserPasswordHistory`;
+
 CREATE TABLE `tblAttributeDefinitionGroups` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `name` varchar(100) default NULL,
diff --git a/install/update-6.1.0/update.sql b/install/update-6.1.0/update.sql
index 543964b76..3b842eeae 100644
--- a/install/update-6.1.0/update.sql
+++ b/install/update-6.1.0/update.sql
@@ -1,6 +1,10 @@
 START TRANSACTION;
 
-ALTER TABLE `tblUsers` CHANGE `pwd` `pwd` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `tblUsers` CHANGE `pwd` `pwd` varchar(255) DEFAULT NULL;
+
+ALTER TABLE `tblUserPasswordHistory` CHANGE `pwd` `pwd` varchar(255) DEFAULT NULL;
+
+ALTER TABLE `tblUserPasswordRequest` CHANGE `hash` `hash` varchar(255) DEFAULT NULL;
 
 ALTER TABLE `tblUsers` ADD COLUMN `webauthn` varchar(1024) DEFAULT NULL AFTER `pwd`;