diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index ce4f9a67..bfbbf897 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -404,6 +404,11 @@
     -->
     <import resource="classpath:validation-beans.xml"/>
     
+    <!--
+        Federation registrationAuthority URIs.
+    -->
+    <bean id="hr_eduhr_registrar" parent="String" c:_0="http://www.srce.hr"/>
+    
     <!--
         identificationStrategy
         
@@ -429,7 +434,7 @@
                 <entry key="http://cafe.rnp.br"               value="BR"/>
                 <entry key="http://www.canarie.ca"            value="CA"/>
                 <entry key="http://cofre.reuna.cl"            value="CL"/>
-                <entry key="http://www.srce.hr"               value="HR"/>
+                <entry key-ref="hr_eduhr_registrar"           value="HR"/>
                 <entry key="http://www.eduid.cz/"             value="CZ"/>
                 <entry key="https://www.wayf.dk"              value="DK"/>
                 <entry key="http://www.csc.fi/haka"           value="FI"/>
diff --git a/mdx/hr_eduhr/beans.xml b/mdx/hr_eduhr/beans.xml
index e653791c..ef923582 100644
--- a/mdx/hr_eduhr/beans.xml
+++ b/mdx/hr_eduhr/beans.xml
@@ -51,15 +51,6 @@
         <property name="verificationCertificate" ref="hr_eduhr_signingCertificate"/>
     </bean>
 
-    <!--
-        hr_eduhr_registrar
-        
-        Unique ID for the registrar associated with this channel.
-    -->
-    <bean id="hr_eduhr_registrar" class="java.lang.String">
-        <constructor-arg value="http://www.aaiedu.hr"/>
-    </bean>
-    
     <!--
         hr_eduhr_check_regauth