diff --git a/install/update-6.0.0/update-postgres.sql b/install/update-6.0.0/update-postgres.sql
index 9e94ab5cc..0631c9bb3 100644
--- a/install/update-6.0.0/update-postgres.sql
+++ b/install/update-6.0.0/update-postgres.sql
@@ -2,9 +2,9 @@ START TRANSACTION;
 
 ALTER TABLE "tblDocumentContent" ADD COLUMN "revisiondate" TIMESTAMP default NULL;
 
-ALTER TABLE "tblUsers" ADD COLUMN "secret" varchar(50) default NULL AFTER "pwd";
+ALTER TABLE "tblUsers" ADD COLUMN "secret" varchar(50) default NULL;
 
-ALTER TABLE "tblWorkflows" ADD COLUMN "layoutdata" text default NULL AFTER "initstate";
+ALTER TABLE "tblWorkflows" ADD COLUMN "layoutdata" text default NULL;
 
 CREATE TABLE "tblUserSubstitutes" (
   "id" SERIAL UNIQUE,
@@ -29,16 +29,16 @@ CREATE TABLE "tblDocumentRecipients" (
   "receiptID" SERIAL UNIQUE,
   "documentID" INTEGER NOT NULL default '0',
   "version" INTEGER NOT NULL default '0',
-  "type" tinyint(4) NOT NULL default '0',
+  "type" INTEGER NOT NULL default '0',
   "required" INTEGER NOT NULL default '0',
-  UNIQUE KEY "documentID" ("documentID","version","type","required"),
+  UNIQUE ("documentID","version","type","required"),
   CONSTRAINT "tblDocumentRecipients_document" FOREIGN KEY ("documentID") REFERENCES "tblDocuments" ("id") ON DELETE CASCADE
 );
 
 CREATE TABLE "tblDocumentReceiptLog" (
   "receiptLogID" SERIAL UNIQUE,
   "receiptID" INTEGER NOT NULL default '0',
-  "status" tinyint(4) NOT NULL default '0',
+  "status" INTEGER NOT NULL default '0',
   "comment" text NOT NULL,
   "date" TIMESTAMP NOT NULL,
   "userID" INTEGER NOT NULL default '0',
@@ -50,17 +50,17 @@ CREATE TABLE "tblDocumentRevisors" (
   "revisionID" SERIAL UNIQUE,
   "documentID" INTEGER NOT NULL default '0',
   "version" INTEGER NOT NULL default '0',
-  "type" tinyint(4) NOT NULL default '0',
+  "type" INTEGER NOT NULL default '0',
   "required" INTEGER NOT NULL default '0',
   "startdate" TIMESTAMP default NULL,
-  UNIQUE KEY "documentID" ("documentID","version","type","required"),
+  UNIQUE ("documentID","version","type","required"),
   CONSTRAINT "tblDocumentRevisors_document" FOREIGN KEY ("documentID") REFERENCES "tblDocuments" ("id") ON DELETE CASCADE
 );
 
 CREATE TABLE "tblDocumentRevisionLog" (
   "revisionLogID" SERIAL UNIQUE,
   "revisionID" INTEGER NOT NULL default '0',
-  "status" tinyint(4) NOT NULL default '0',
+  "status" INTEGER NOT NULL default '0',
   "comment" text NOT NULL,
   "date" TIMESTAMP NOT NULL,
   "userID" INTEGER NOT NULL default '0',
@@ -74,7 +74,7 @@ CREATE TABLE "tblTransmittals" (
   "comment" text NOT NULL,
   "userID" INTEGER NOT NULL default '0',
   "date" TIMESTAMP default NULL,
-  "public" tinyint(1) NOT NULL default '0',
+  "public" INTEGER NOT NULL default '0',
   CONSTRAINT "tblTransmittals_user" FOREIGN KEY ("userID") REFERENCES "tblUsers" ("id") ON DELETE CASCADE
 );
 
@@ -82,9 +82,9 @@ CREATE TABLE "tblTransmittalItems" (
   "id" SERIAL UNIQUE,
 	"transmittal" INTEGER NOT NULL DEFAULT '0',
   "document" INTEGER default NULL,
-  "version" INTEGER unsigned NOT NULL default '0',
+  "version" INTEGER NOT NULL default '0',
   "date" TIMESTAMP default NULL,
-  UNIQUE (transmittal, document, version),
+  UNIQUE ("transmittal", "document", "version"),
   CONSTRAINT "tblTransmittalItems_document" FOREIGN KEY ("document") REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
   CONSTRAINT "tblTransmittalItem_transmittal" FOREIGN KEY ("transmittal") REFERENCES "tblTransmittals" ("id") ON DELETE CASCADE
 );
@@ -104,7 +104,8 @@ SELECT nextval('"tblRoles_id_seq"');
 INSERT INTO "tblRoles" ("id", "name", "role") VALUES (3, 'User', 0);
 SELECT nextval('"tblRoles_id_seq"');
 
-ALTER TABLE "tblUsers" CHANGE "role" "role" INTEGER NOT NULL;
+ALTER TABLE "tblUsers" ALTER "role" DROP DEFAULT;
+ALTER TABLE "tblUsers" ALTER "role" SET NOT NULL;
 UPDATE "tblUsers" SET role=3 WHERE role=0;
 ALTER TABLE "tblUsers" ADD CONSTRAINT "tblUsers_role" FOREIGN KEY ("role") REFERENCES "tblRoles" ("id");
 
@@ -128,11 +129,11 @@ CREATE TABLE "tblArosAcos" (
   "id" SERIAL UNIQUE,
   "aro" INTEGER NOT NULL DEFAULT '0',
   "aco" INTEGER NOT NULL DEFAULT '0',
-  "create" tinyint(4) NOT NULL DEFAULT '-1',
-  "read" tinyint(4) NOT NULL DEFAULT '-1',
-  "update" tinyint(4) NOT NULL DEFAULT '-1',
-  "delete" tinyint(4) NOT NULL DEFAULT '-1',
-  UNIQUE (aco, aro),
+  "create" INTEGER NOT NULL DEFAULT '-1',
+  "read" INTEGER NOT NULL DEFAULT '-1',
+  "update" INTEGER NOT NULL DEFAULT '-1',
+  "delete" INTEGER NOT NULL DEFAULT '-1',
+  UNIQUE ("aco", "aro"),
   CONSTRAINT "tblArosAcos_acos" FOREIGN KEY ("aco") REFERENCES "tblAcos" ("id") ON DELETE CASCADE,
   CONSTRAINT "tblArosAcos_aros" FOREIGN KEY ("aro") REFERENCES "tblAros" ("id") ON DELETE CASCADE
 );