diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 53af95f62..83c5f4df5 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -68,7 +68,7 @@ CREATE TABLE `tblRoles` (
 CREATE TABLE `tblUsers` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `login` varchar(50) DEFAULT NULL,
-  `pwd` varchar(50) DEFAULT NULL,
+  `pwd` varchar(255) 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-postgres.sql b/install/update-6.1.0/update-postgres.sql
index 9df1b3130..f2539219a 100644
--- a/install/update-6.1.0/update-postgres.sql
+++ b/install/update-6.1.0/update-postgres.sql
@@ -1,13 +1,6 @@
 START TRANSACTION;
 
-CREATE TABLE "tblDownloadLinks" (
-  "id" SERIAL UNIQUE,
-  "document" INTEGER REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
-  "version" INTEGER NOT NULL default '0',
-  "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
-  "hash" varchar(50) default NULL,
-  "valid" TIMESTAMP default NULL
-);
+ALTER TABLE "tblUsers" ALTER COLUMN "pwd" TYPE varchar(255) 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 afe9b0af7..7f06a3de4 100644
--- a/install/update-6.1.0/update-sqlite3.sql
+++ b/install/update-6.1.0/update-sqlite3.sql
@@ -1,14 +1,31 @@
 BEGIN;
 
-CREATE TABLE `tblDownloadLinks` (
+CREATE TABLE `new_tblUsers` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `document` INTEGER REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
-  `version` INTEGER unsigned NOT NULL default '0',
-  `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
-  `hash` varchar(50) default NULL,
-  `valid` TEXT default NULL
+  `login` varchar(50) default NULL,
+  `pwd` varchar(255) default NULL,
+  `secret` varchar(50) default NULL,
+  `fullName` varchar(100) default NULL,
+  `email` varchar(70) default NULL,
+  `language` varchar(32) NOT NULL,
+  `theme` varchar(32) NOT NULL,
+  `comment` text NOT NULL,
+  `role` INTEGER NOT NULL REFERENCES `tblRoles` (`id`),
+  `hidden` INTEGER NOT NULL default '0',
+  `pwdExpiration` TEXT default NULL,
+  `loginfailures` INTEGER NOT NULL default '0',
+  `disabled` INTEGER NOT NULL default '0',
+  `quota` INTEGER,
+  `homefolder` INTEGER default NULL REFERENCES `tblFolders` (`id`),
+  UNIQUE (`login`)
 );
 
+INSERT INTO `new_tblUsers` SELECT * FROM `tblUsers`;
+
+DROP TABLE `tblUsers`;
+
+ALTER TABLE `new_tblUsers` RENAME TO `tblUsers`;
+
 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 a0f8510c5..61101f0ec 100644
--- a/install/update-6.1.0/update.sql
+++ b/install/update-6.1.0/update.sql
@@ -1,16 +1,6 @@
 START TRANSACTION;
 
-CREATE TABLE `tblDownloadLinks` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `document` int(11) NOT NULL DEFAULT '0',
-  `version` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `userID` int(11) NOT NULL DEFAULT '0',
-  `hash` varchar(50) DEFAULT NULL,
-  `valid` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  CONSTRAINT `tblDownloadLink_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
-  CONSTRAINT `tblDownloadLink_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ALTER TABLE `tblUsers` CHANGE `pwd` `pwd` varchar(255) NOT NULL DEFAULT '';
 
 CREATE TABLE `tblAttributeDefinitionGroups` (
   `id` int(11) NOT NULL AUTO_INCREMENT,