diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
index bc5c7571..a4b51fee 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
@@ -68,7 +68,7 @@ public class LdapBindAuthenticator
     private LdapConnectionFactory connectionFactory;
 
     @Inject
-    @Named( value = "userConfiguration" )
+    @Named( value = "userConfiguration#default" )
     private UserConfiguration config;
 
     @Inject
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
index ba7d7001..dce48725 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
@@ -43,7 +43,7 @@
     <property name="contextFactory" value="com.sun.jndi.ldap.LdapCtxFactory"/>
     <property name="password" value="secret"/>
     <property name="bindDn" value="uid=admin,ou=system"/>
-    <property name="userConf" ref="userConfiguration"/>
+    <property name="userConf" ref="userConfiguration#default"/>
   </bean>
 
   <bean name="userMapper#ldap" class="org.apache.archiva.redback.common.ldap.LdapUserMapper">
@@ -53,10 +53,10 @@
     <property name="userIdAttribute" value="cn"/>
     <property name="userBaseDn" value="dc=redback,dc=plexus,dc=codehaus,dc=org"/>
     <property name="userObjectClass" value="inetOrgPerson"/>
-    <property name="userConf" ref="userConfiguration"/>
+    <property name="userConf" ref="userConfiguration#default"/>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"
       init-method="initialize">
     <property name="configs">
       <list>
diff --git a/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java b/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
index eeb1cf68..132651be 100644
--- a/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
+++ b/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
@@ -47,7 +47,7 @@ public class UserConfigurableJdoFactory
     private Logger log = LoggerFactory.getLogger( getClass() );
 
     @Inject
-    @Named( value = "userConfiguration" )
+    @Named( value = "userConfiguration#default" )
     private UserConfiguration config;
 
     private String getConfigString( String key, String currentValue, String defaultValue )
diff --git a/redback-common/redback-common-jdo/src/main/resources/META-INF/spring-context.xml b/redback-common/redback-common-jdo/src/main/resources/META-INF/spring-context.xml
index db81fdd7..6c510910 100644
--- a/redback-common/redback-common-jdo/src/main/resources/META-INF/spring-context.xml
+++ b/redback-common/redback-common-jdo/src/main/resources/META-INF/spring-context.xml
@@ -25,6 +25,6 @@
         default-lazy-init="true">
 
   <bean name="jdoFactory#users" class="org.apache.archiva.redback.common.jdo.UserConfigurableJdoFactory">
-    <property name="config" ref="userConfiguration"/>
+    <property name="config" ref="userConfiguration#default"/>
   </bean>
 </beans>
\ No newline at end of file
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
index 8e4f2599..614ca015 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
@@ -80,7 +80,7 @@ public class LdapUserMapper
     int maxResultCount = 0;
 
     @Inject
-    @Named(value = "userConfiguration")
+    @Named(value = "userConfiguration#default")
     private UserConfiguration userConf;
 
     @PostConstruct
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
index e5438b9c..c67da2e6 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
@@ -63,7 +63,7 @@ public class ConfigurableLdapConnectionFactory
 
 
     @Inject
-    @Named( value = "userConfiguration" )
+    @Named( value = "userConfiguration#default" )
     private UserConfiguration userConf;
 
     // ----------------------------------------------------------------------
diff --git a/redback-common/redback-common-ldap/src/test/resources/spring-context.xml b/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
index 6bb89bcf..f9399e06 100644
--- a/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
+++ b/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
@@ -23,7 +23,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="configs">
       <list>
         <value>src/test/resources/test.properties</value>
diff --git a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
index cf3016a1..47bfe4b3 100644
--- a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
+++ b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
@@ -41,7 +41,7 @@
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  * @since 2.1
  */
-@Service("userConfiguration")
+@Service("userConfiguration#default")
 public class DefaultUserConfiguration
     implements UserConfiguration
 {
diff --git a/redback-configuration/src/main/resources/META-INF/spring-context.xml b/redback-configuration/src/main/resources/META-INF/spring-context.xml
index fec5d211..50fce3a8 100644
--- a/redback-configuration/src/main/resources/META-INF/spring-context.xml
+++ b/redback-configuration/src/main/resources/META-INF/spring-context.xml
@@ -29,6 +29,6 @@
   <context:annotation-config />
   <context:component-scan base-package="org.apache.archiva.redback.configuration"/>
 
-  <alias name="userConfiguration" alias="userConfiguration#redback"/>
+  <alias name="userConfiguration#default" alias="userConfiguration#redback"/>
  
 </beans>
\ No newline at end of file
diff --git a/redback-data-management/src/test/resources/spring-context.xml b/redback-data-management/src/test/resources/spring-context.xml
index 06ea9af3..137002f2 100644
--- a/redback-data-management/src/test/resources/spring-context.xml
+++ b/redback-data-management/src/test/resources/spring-context.xml
@@ -29,7 +29,7 @@
   <context:property-placeholder system-properties-mode="OVERRIDE"/>
 
   <bean name="jdoFactory#users" class="org.apache.archiva.redback.common.jdo.UserConfigurableJdoFactory">
-    <property name="config" ref="userConfiguration"/>
+    <property name="config" ref="userConfiguration#default"/>
     <!--
     <property name="driverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
     <property name="url" value="jdbc:derby:memory:users-test" />
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
index 273e07f2..bdb8580c 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
@@ -68,7 +68,7 @@ public class MailerImpl
     private SecuritySystem securitySystem;
 
     @Inject
-    @Named( value = "userConfiguration" )
+    @Named( value = "userConfiguration#default" )
     private UserConfiguration config;
 
     public void sendAccountValidationEmail( Collection<String> recipients, AuthenticationKey authkey, String baseUrl )
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
index 1db1a464..19afabd5 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
@@ -49,7 +49,7 @@ public class VelocityMailGenerator
     private Logger log = LoggerFactory.getLogger( VelocityMailGenerator.class );
 
     @Inject
-    @Named(value = "userConfiguration")
+    @Named(value = "userConfiguration#default")
     private UserConfiguration config;
 
     // FIXME use the spring directly 
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
index 6c0b82e9..90fa8f45 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
@@ -88,7 +88,7 @@ public class DefaultUserService
     private SecuritySystem securitySystem;
 
     @Inject
-    @Named( value = "userConfiguration" )
+    @Named( value = "userConfiguration#default" )
     private UserConfiguration config;
 
     @Inject
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
index f9610a2b..d37c83ba 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
@@ -44,7 +44,7 @@ public class FakeCreateAdminServiceImpl
     private UserManager userManager;
 
     @Inject
-    @Named( value = "userConfiguration" )
+    @Named( value = "userConfiguration#default" )
     private UserConfiguration config;
 
     @Inject
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
index 906a0fd4..29c6adf8 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
@@ -20,14 +20,10 @@
   -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:jaxrs="http://cxf.apache.org/jaxrs"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://cxf.apache.org/jaxrs
-           http://cxf.apache.org/schemas/jaxrs.xsd">
+           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"
       init-method="initialize">
     <property name="configs">
       <list>
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
index 5d60d1dc..add479b8 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
@@ -40,7 +40,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
index 38e6ca73..dd75f723 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
@@ -36,7 +36,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
index 87b23844..9d3947c1 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
@@ -34,7 +34,7 @@
 public abstract class AbstractCookieSettings
     implements CookieSettings
 {
-    @Inject @Named(value="userConfiguration")
+    @Inject @Named(value="userConfiguration#default")
     protected UserConfiguration config;
 
     /**
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
index 6fefb38f..c78cee3b 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
@@ -52,7 +52,7 @@ public class DefaultUserSecurityPolicy
     private PasswordRule defaultPasswordRule = new MustHavePasswordRule();
 
     @Inject
-    @Named(value = "userConfiguration")
+    @Named(value = "userConfiguration#default")
     private UserConfiguration config;
 
     @Inject
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
index c16d9d9f..8ce34194 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
@@ -35,7 +35,7 @@
 public class DefaultUserValidationSettings
     implements UserValidationSettings
 {
-    @Resource( name = "userConfiguration" )
+    @Resource( name = "userConfiguration#default" )
     private UserConfiguration config;
 
     private boolean emailValidationRequired;
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
index 73183e0e..68065841 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
@@ -33,7 +33,7 @@ public abstract class AbstractPasswordRule
 {
     protected boolean enabled = true;
 
-    @Inject @Named (value="userConfiguration")
+    @Inject @Named (value="userConfiguration#default")
     protected UserConfiguration config;
 
     public boolean isEnabled()
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
index bc04bd96..a6464184 100755
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
@@ -38,7 +38,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
index 9699fe7f..c7b54f03 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
@@ -41,7 +41,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
index 5fea7699..33592849 100755
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
@@ -37,7 +37,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
index 9ffa4420..b69cc120 100644
--- a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
+++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
@@ -70,7 +70,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
index 5311b624..9f59f4e9 100755
--- a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
@@ -39,7 +39,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-system/src/test/resources/spring-context.xml b/redback-system/src/test/resources/spring-context.xml
index 38e6ca73..dd75f723 100644
--- a/redback-system/src/test/resources/spring-context.xml
+++ b/redback-system/src/test/resources/spring-context.xml
@@ -36,7 +36,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java b/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
index d4a3a361..909c831b 100644
--- a/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
@@ -40,7 +40,7 @@ public class ConfigurableUserManager
     implements UserManager
 {
     @Inject
-    @Named( value = "userConfiguration" )
+    @Named( value = "userConfiguration#default" )
     private UserConfiguration config;
 
     @Inject
diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml
index 2db3f24a..7ad0ca86 100644
--- a/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml
@@ -27,14 +27,14 @@
            http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
   <bean name="jdoFactory#users" class="org.apache.archiva.redback.common.jdo.UserConfigurableJdoFactory">
-    <property name="config" ref="userConfiguration"/>
+    <property name="config" ref="userConfiguration#default"/>
     <property name="driverName" value="org.hsqldb.jdbcDriver"/>
     <property name="url" value="jdbc:hsqldb:mem:redback-users-tests" />
     <property name="userName" value="sa"/>
     <property name="password" value=""/>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
index 689b6b7a..9d7dbd53 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
@@ -43,7 +43,7 @@
     <property name="contextFactory" value="com.sun.jndi.ldap.LdapCtxFactory"/>
     <property name="password" value="secret"/>
     <property name="bindDn" value="uid=admin,ou=system"/>
-    <property name="userConf" ref="userConfiguration"/>
+    <property name="userConf" ref="userConfiguration#default"/>
   </bean>
 
   <bean name="userMapper#ldap" class="org.apache.archiva.redback.common.ldap.LdapUserMapper">
@@ -53,7 +53,7 @@
     <property name="userIdAttribute" value="cn"/>
     <property name="userBaseDn" value="dc=redback,dc=plexus,dc=codehaus,dc=org"/>
     <property name="userObjectClass" value="inetOrgPerson"/>
-    <property name="userConf" ref="userConfiguration"/>
+    <property name="userConf" ref="userConfiguration#default"/>
   </bean>
 
 </beans>
\ No newline at end of file