diff --git a/dbrepo-auth-service/listeners/target/create-event-listener.jar b/dbrepo-auth-service/listeners/target/create-event-listener.jar
index 9fb1271c4361841c3d4061e536d23bc16b590d0e..70d8723ddff0b6e19308a52bff647932ef2eb3ad 100644
Binary files a/dbrepo-auth-service/listeners/target/create-event-listener.jar and b/dbrepo-auth-service/listeners/target/create-event-listener.jar differ
diff --git a/dbrepo-ui/components/table/TableSchema.vue b/dbrepo-ui/components/table/TableSchema.vue
index 62d88647e4c1ee39a51be16ef2e6f50a6c739e86..f7cb3b3eb09a7d708a4cef5dce9d9e402ad7fc0b 100644
--- a/dbrepo-ui/components/table/TableSchema.vue
+++ b/dbrepo-ui/components/table/TableSchema.vue
@@ -152,7 +152,6 @@
           <v-checkbox
             v-model="c.unique"
             :disabled="disabled || c.type === 'serial'"
-            :hidden="c.primary_key"
             :label="$t('pages.table.subpages.schema.unique.label')" />
         </v-col>
         <v-col
@@ -250,6 +249,9 @@ export default {
       return this.$vuetify.theme.global.name.toLowerCase().endsWith('contrast') ? runtimeConfig.public.variant.button.contrast : runtimeConfig.public.variant.button.normal
     },
     showPrimaryKeyWarning () {
+      if (this.disabled) {
+        return false
+      }
       return this.columns.filter(c => c.primary_key).length === 0
     }
   },
diff --git a/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue b/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue
index 56db5fdc374cdfd683eb00328f86534cd9fd81bf..54d539ed17154c4235d7db9121463d1aab5ebd5e 100644
--- a/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue
+++ b/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue
@@ -155,12 +155,11 @@
             </v-stepper-header>
             <v-stepper-window
               direction="vertical">
-              <v-container
-                v-if="step >= 4">
+              <v-container>
                 <TableSchema
                   ref="schema"
                   :back="false"
-                  :disabled="step > 4"
+                  :disabled="step !== 4"
                   :loading="loading"
                   :submit-text="$t('navigation.continue')"
                   :columns="tableCreate.columns"
diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar
index 9fb1271c4361841c3d4061e536d23bc16b590d0e..70d8723ddff0b6e19308a52bff647932ef2eb3ad 100644
Binary files a/helm/dbrepo/files/create-event-listener.jar and b/helm/dbrepo/files/create-event-listener.jar differ