diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java
index 72667e6107..a65b7898e8 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java
@@ -16,6 +16,7 @@
  */
 package org.apache.jackrabbit.oak.security.authentication;
 
+import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Nonnull;
 
@@ -57,8 +58,7 @@ public class AuthenticationConfigurationImpl extends ConfigurationBase implement
 
         @AttributeDefinition(
                 name = "Application Name",
-                description = "Application named used for JAAS authentication",
-                defaultValue = AuthenticationConfiguration.DEFAULT_APP_NAME
+                description = "Application named used for JAAS authentication"
         )
         String org_apache_jackrabbit_oak_authentication_appName() default AuthenticationConfiguration.DEFAULT_APP_NAME;
 
@@ -82,7 +82,10 @@ public class AuthenticationConfigurationImpl extends ConfigurationBase implement
 
     @SuppressWarnings("UnusedDeclaration")
     @Activate
-    private void activate(Map<String, Object> properties) {
+    private void activate(Configuration configuration, Map<String, Object> properties) {
+        HashMap<String, Object> copy = new HashMap<>(properties);
+        // make sure default value is set in map
+        copy.put("org.apache.jackrabbit.oak.authentication.appName", configuration.org_apache_jackrabbit_oak_authentication_appName());
         setParameters(ConfigurationParameters.of(properties));
     }
 
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java
index 561b009ff4..ea5fc573b7 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java
@@ -64,6 +64,7 @@ import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.Designate;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 import org.osgi.service.metatype.annotations.Option;
 
@@ -73,6 +74,7 @@ import org.osgi.service.metatype.annotations.Option;
 @Component(
         service = {AuthorizationConfiguration.class, SecurityConfiguration.class},
         property = OAK_SECURITY_NAME + "=org.apache.jackrabbit.oak.security.authorization.AuthorizationConfigurationImpl")
+@Designate(ocd = AuthorizationConfigurationImpl.Configuration.class)
 public class AuthorizationConfigurationImpl extends ConfigurationBase implements AuthorizationConfiguration {
     
     @ObjectClassDefinition(name = "Apache Jackrabbit Oak AuthorizationConfiguration")
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
index 7d25a0be79..5eef7945a9 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
@@ -52,10 +52,10 @@ public class DefaultAuthorizableActionProvider implements AuthorizableActionProv
                 description = "The set of actions that is supported by this provider implementation.",
                 cardinality = 4,
                 options = {
-                        @Option(label = "org.apache.jackrabbit.oak.spi.security.user.action.AccessControlAction", value = "AccessControlAction"),
-                        @Option(label = "org.apache.jackrabbit.oak.spi.security.user.action.PasswordValidationAction", value = "PasswordValidationAction"),
-                        @Option(label = "org.apache.jackrabbit.oak.spi.security.user.action.PasswordChangeAction", value = "PasswordChangeAction"),
-                        @Option(label = "org.apache.jackrabbit.oak.spi.security.user.action.ClearMembershipAction", value = "ClearMembershipAction")
+                        @Option(value = "org.apache.jackrabbit.oak.spi.security.user.action.AccessControlAction", label = "AccessControlAction"),
+                        @Option(value = "org.apache.jackrabbit.oak.spi.security.user.action.PasswordValidationAction", label = "PasswordValidationAction"),
+                        @Option(value = "org.apache.jackrabbit.oak.spi.security.user.action.PasswordChangeAction", label = "PasswordChangeAction"),
+                        @Option(value = "org.apache.jackrabbit.oak.spi.security.user.action.ClearMembershipAction", label = "ClearMembershipAction")
                 })
         String[] enabledActions();