diff --git a/database/core.tsql b/database/core.tsql
index d88bb64ab3b4ae845fdc23bd54f9ae6d8a225aa8..a38fdd430e7271d01802862433e15fa459f3c1f9 100644
--- a/database/core.tsql
+++ b/database/core.tsql
@@ -22,13 +22,12 @@ CREATE TABLE @PREFIX@user_attributes (
 	UserID			@SERIAL_REF_TYPE@ NOT NULL,
 
 	Name			VARCHAR(255) NOT NULL,
-	Operator		VARCHAR(3) NOT NULL,
+	Operator		VARCHAR(4) NOT NULL,
 	Value			VARCHAR(255),
 
 	Disabled		SMALLINT NOT NULL DEFAULT '0',
 
-	FOREIGN KEY (UserID) REFERENCES @PREFIX@users(ID),
-	UNIQUE (Name)
+	FOREIGN KEY (UserID) REFERENCES @PREFIX@users(ID)
 ) @CREATE_TABLE_SUFFIX@;
 
 
@@ -42,9 +41,8 @@ CREATE TABLE @PREFIX@groups (
 
 	Disabled		SMALLINT NOT NULL DEFAULT '0',
 
-	Comment			VARCHAR(1024),
+	Comment			VARCHAR(1024)
 
-	UNIQUE (Name)
 )  @CREATE_TABLE_SUFFIX@;
 CREATE INDEX @PREFIX@groups_idx1 ON @PREFIX@groups (Name);
 
@@ -56,13 +54,12 @@ CREATE TABLE @PREFIX@group_attributes (
 	GroupID			@SERIAL_REF_TYPE@ NOT NULL,
 
 	Name			VARCHAR(255) NOT NULL,
-	Operator		VARCHAR(3) NOT NULL,
+	Operator		VARCHAR(4) NOT NULL,
 	Value			VARCHAR(255),
 
 	Disabled		SMALLINT NOT NULL DEFAULT '0',
 
-	FOREIGN KEY (GroupID) REFERENCES @PREFIX@groups(ID),
-	UNIQUE (Name)
+	FOREIGN KEY (GroupID) REFERENCES @PREFIX@groups(ID)
 ) @CREATE_TABLE_SUFFIX@;