diff --git a/config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql b/config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
index 34e649b7b7c..d4582023fc3 100644
--- a/config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
+++ b/config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
@@ -590,6 +590,9 @@ ADD CONSTRAINT uc_generic_object_name UNIQUE (name_norm);
 ALTER TABLE m_lookup_table
 ADD CONSTRAINT uc_lookup_name UNIQUE (name_norm);
 
+ALTER TABLE m_lookup_table_row
+ADD CONSTRAINT uc_row_key UNIQUE (row_key);
+
 ALTER TABLE m_node
 ADD CONSTRAINT uc_node_name UNIQUE (name_norm);
 
diff --git a/config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql b/config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql
index afabf0d1b01..45e29ca8d5c 100644
--- a/config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql
+++ b/config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql
@@ -6,7 +6,7 @@ CREATE TABLE m_lookup_table (
 );
 
 CREATE TABLE m_lookup_table_row (
-  id                  INT2        NOT NULL,
+  id                  INT4        NOT NULL,
   owner_oid           VARCHAR(36) NOT NULL,
   row_key             VARCHAR(255),
   label_norm          VARCHAR(255),
@@ -47,5 +47,4 @@ ALTER TABLE m_assignment_ext_string ALTER COLUMN anyContainer_owner_id TYPE INT4
 ALTER TABLE m_assignment_extension ALTER COLUMN owner_id TYPE INT4;
 ALTER TABLE m_assignment_reference ALTER COLUMN owner_id TYPE INT4;
 ALTER TABLE m_exclusion ALTER COLUMN id TYPE INT4;
-ALTER TABLE m_lookup_table_row ALTER COLUMN id TYPE INT4;
 ALTER TABLE m_trigger ALTER COLUMN id TYPE INT4;