diff --git a/src/main/java/io/github/genomicdatainfrastructure/daam/api/ApplicationCommandApiImpl.java b/src/main/java/io/github/genomicdatainfrastructure/daam/api/ApplicationCommandApiImpl.java
index 9d393e2..cd49ab7 100644
--- a/src/main/java/io/github/genomicdatainfrastructure/daam/api/ApplicationCommandApiImpl.java
+++ b/src/main/java/io/github/genomicdatainfrastructure/daam/api/ApplicationCommandApiImpl.java
@@ -29,7 +29,7 @@ public ApplicationCommandApiImpl(
             SubmitApplicationService submitApplicationService,
             AttachFileToApplicationService attachFileToApplicationService,
             AcceptTermsService acceptTermsService,
-            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim") String userIdClaim
+            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim", defaultValue = "elixir_id") String userIdClaim
     ) {
         this.identity = identity;
         this.saveApplicationService = saveApplicationService;
diff --git a/src/main/java/io/github/genomicdatainfrastructure/daam/api/ApplicationQueryApiImpl.java b/src/main/java/io/github/genomicdatainfrastructure/daam/api/ApplicationQueryApiImpl.java
index 15605bc..3877ccc 100644
--- a/src/main/java/io/github/genomicdatainfrastructure/daam/api/ApplicationQueryApiImpl.java
+++ b/src/main/java/io/github/genomicdatainfrastructure/daam/api/ApplicationQueryApiImpl.java
@@ -26,7 +26,7 @@ public ApplicationQueryApiImpl(
             SecurityIdentity identity,
             ListApplicationsService listApplicationsService,
             RetrieveApplicationService retrieveApplicationService,
-            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim") String userIdClaim
+            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim", defaultValue = "elixir_id") String userIdClaim
     ) {
         this.identity = identity;
         this.listApplicationsService = listApplicationsService;
diff --git a/src/main/java/io/github/genomicdatainfrastructure/daam/api/EntitlementQueryApiImpl.java b/src/main/java/io/github/genomicdatainfrastructure/daam/api/EntitlementQueryApiImpl.java
index 979e29c..c4ccdd8 100644
--- a/src/main/java/io/github/genomicdatainfrastructure/daam/api/EntitlementQueryApiImpl.java
+++ b/src/main/java/io/github/genomicdatainfrastructure/daam/api/EntitlementQueryApiImpl.java
@@ -19,7 +19,7 @@ public class EntitlementQueryApiImpl implements EntitlementQueryApi {
     public EntitlementQueryApiImpl(
             SecurityIdentity identity,
             RetrieveGrantedDatasetIdentifiersService retrieveGrantedDatasetIdentifiersService,
-            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim") String userIdClaim
+            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim", defaultValue = "elixir_id") String userIdClaim
     ) {
         this.identity = identity;
         this.retrieveGrantedDatasetIdentifiersService = retrieveGrantedDatasetIdentifiersService;
diff --git a/src/main/java/io/github/genomicdatainfrastructure/daam/security/PostAuthenticationFilter.java b/src/main/java/io/github/genomicdatainfrastructure/daam/security/PostAuthenticationFilter.java
index 714c1d6..9da45ff 100644
--- a/src/main/java/io/github/genomicdatainfrastructure/daam/security/PostAuthenticationFilter.java
+++ b/src/main/java/io/github/genomicdatainfrastructure/daam/security/PostAuthenticationFilter.java
@@ -29,7 +29,7 @@ public class PostAuthenticationFilter implements ContainerRequestFilter {
     public PostAuthenticationFilter(
             SecurityIdentity identity,
             CreateRemsUserService createRemsUserService,
-            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim") String userIdClaim
+            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim", defaultValue = "elixir_id") String userIdClaim
     ) {
         this.identity = identity;
         this.createRemsUserService = createRemsUserService;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 771c834..e9788e9 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -15,7 +15,6 @@ quarkus.openapi-generator.codegen.spec.rems_yaml.generate-part-filename=false
 quarkus.rest-client.rems_yaml.api-key=42
 quarkus.rest-client.rems_yaml.bot-user=owner
 quarkus.rest-client.rems_yaml.url=http://localhost:4000
-quarkus.rest-client.rems_yaml.user-id-claim=elixir_id
 quarkus.keycloak.devservices.realm-path=quarkus-realm.json
 quarkus.keycloak.devservices.port=32794
 quarkus.wiremock.devservices.port=4000