diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 56f29c31e..da8a80b58 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -113,7 +113,7 @@ CREATE TABLE `tblUserSubstitutes` (
 CREATE TABLE `tblUserPasswordRequest` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `userID` int(11) NOT NULL DEFAULT '0',
-  `hash` varchar(50) DEFAULT NULL,
+  `hash` varchar(255) DEFAULT NULL,
   `date` datetime NOT NULL,
   PRIMARY KEY (`id`),
   KEY `tblUserPasswordRequest_user` (`userID`),
@@ -129,7 +129,7 @@ CREATE TABLE `tblUserPasswordRequest` (
 CREATE TABLE `tblUserPasswordHistory` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `userID` int(11) NOT NULL DEFAULT '0',
-  `pwd` varchar(50) DEFAULT NULL,
+  `pwd` varchar(255) DEFAULT NULL,
   `date` datetime NOT NULL,
   PRIMARY KEY (`id`),
   KEY `tblUserPasswordHistory_user` (`userID`),
diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index 280234157..f571edc6b 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -63,8 +63,8 @@ CREATE TABLE "tblRoles" (
 CREATE TABLE "tblUsers" (
   "id" SERIAL UNIQUE,
   "login" varchar(50) default NULL,
-  "pwd" varchar(50) default NULL,
-  "pwd" text default NULL,
+  "pwd" varchar(255) default NULL,
+  "webauthn" text default NULL,
   "secret" varchar(50) default NULL,
   "fullName" varchar(100) default NULL,
   "email" varchar(70) default NULL,
@@ -102,7 +102,7 @@ CREATE TABLE "tblUserSubstitutes" (
 CREATE TABLE "tblUserPasswordRequest" (
   "id" SERIAL UNIQUE,
   "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" (id) ON DELETE CASCADE,
-  "hash" varchar(50) default NULL,
+  "hash" varchar(255) default NULL,
   "date" TIMESTAMP default NULL
 );
 
@@ -115,7 +115,7 @@ CREATE TABLE "tblUserPasswordRequest" (
 CREATE TABLE "tblUserPasswordHistory" (
   "id" SERIAL UNIQUE,
   "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
-  "pwd" varchar(50) default NULL,
+  "pwd" varchar(255) default NULL,
   "date" TIMESTAMP default NULL
 );
 
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index d5edb395f..6ac0483ea 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -64,7 +64,7 @@ CREATE TABLE `tblRoles` (
 CREATE TABLE `tblUsers` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `login` varchar(50) default NULL,
-  `pwd` varchar(50) default NULL,
+  `pwd` varchar(255) default NULL,
   `webauthn` TEXT default NULL,
   `secret` varchar(50) default NULL,
   `fullName` varchar(100) default NULL,
@@ -104,7 +104,7 @@ CREATE TABLE `tblUserSubstitutes` (
 CREATE TABLE `tblUserPasswordRequest` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
-  `hash` varchar(50) default NULL,
+  `hash` varchar(255) default NULL,
   `date` TEXT NOT NULL
 );
 
@@ -117,7 +117,7 @@ CREATE TABLE `tblUserPasswordRequest` (
 CREATE TABLE `tblUserPasswordHistory` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
-  `pwd` varchar(50) default NULL,
+  `pwd` varchar(255) default NULL,
   `date` TEXT NOT NULL
 );
 
diff --git a/install/update-6.1.0/update-postgres.sql b/install/update-6.1.0/update-postgres.sql
index c6605a4dd..32988e6e8 100644
--- a/install/update-6.1.0/update-postgres.sql
+++ b/install/update-6.1.0/update-postgres.sql
@@ -6,7 +6,7 @@ ALTER TABLE "tblUserPasswordHistory" ALTER COLUMN "pwd" varchar(255) DEFAULT NUL
 
 ALTER TABLE "tblUserPasswordRequest" ALTER COLUMN "hash" varchar(255) DEFAULT NULL;
 
-ALTER TABLE "tblUsers" ADD COLUMN "webauthn" TYPE varchar(1024) DEFAULT NULL;
+ALTER TABLE "tblUsers" ADD COLUMN "webauthn" TYPE text DEFAULT NULL;
 
 CREATE TABLE "tblAttributeDefinitionGroups" (
   "id" SERIAL UNIQUE,
diff --git a/install/update-6.1.0/update-sqlite3.sql b/install/update-6.1.0/update-sqlite3.sql
index f0ecde747..dadc312c8 100644
--- a/install/update-6.1.0/update-sqlite3.sql
+++ b/install/update-6.1.0/update-sqlite3.sql
@@ -4,7 +4,7 @@ CREATE TABLE `new_tblUsers` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `login` varchar(50) default NULL,
   `pwd` varchar(255) default NULL,
-  `webauthn` varchar(1024) default NULL,
+  `webauthn` TEXT default NULL,
   `secret` varchar(50) default NULL,
   `fullName` varchar(100) default NULL,
   `email` varchar(70) default NULL,
diff --git a/install/update-6.1.0/update.sql b/install/update-6.1.0/update.sql
index 3b842eeae..57fd4c568 100644
--- a/install/update-6.1.0/update.sql
+++ b/install/update-6.1.0/update.sql
@@ -6,7 +6,7 @@ ALTER TABLE `tblUserPasswordHistory` CHANGE `pwd` `pwd` varchar(255) DEFAULT NUL
 
 ALTER TABLE `tblUserPasswordRequest` CHANGE `hash` `hash` varchar(255) DEFAULT NULL;
 
-ALTER TABLE `tblUsers` ADD COLUMN `webauthn` varchar(1024) DEFAULT NULL AFTER `pwd`;
+ALTER TABLE `tblUsers` ADD COLUMN `webauthn` text DEFAULT NULL AFTER `pwd`;
 
 CREATE TABLE `tblAttributeDefinitionGroups` (
   `id` int(11) NOT NULL AUTO_INCREMENT,