diff --git a/src/main/resources/eu/dnet/openaire/usermanagement/springContext-dnetOpenaireUsersService.properties b/src/main/resources/eu/dnet/openaire/usermanagement/springContext-dnetOpenaireUsersService.properties
index eb5e129..8d0dff9 100644
--- a/src/main/resources/eu/dnet/openaire/usermanagement/springContext-dnetOpenaireUsersService.properties
+++ b/src/main/resources/eu/dnet/openaire/usermanagement/springContext-dnetOpenaireUsersService.properties
@@ -1,2 +1,8 @@
 google.recaptcha.secret = 6LfYrU8UAAAAADwrbImPvDo_XcxEZvrkkgMy9yU0
-google.recaptcha.key = 6LfYrU8UAAAAAFsl3m2YhP1uavdmAdFEXBkoY_vd
\ No newline at end of file
+google.recaptcha.key = 6LfYrU8UAAAAAFsl3m2YhP1uavdmAdFEXBkoY_vd
+
+registry.issuer = https://openaire-dev.aai-dev.grnet.gr/registry
+registry.user = user
+registry.password = pass
+registry.version = 1.0
+registry.coid = 2
diff --git a/src/main/webapp/overview.jsp b/src/main/webapp/overview.jsp
index b47c9f2..103b1d7 100644
--- a/src/main/webapp/overview.jsp
+++ b/src/main/webapp/overview.jsp
@@ -44,10 +44,15 @@
             <div class="uk-margin-top">
                 The OpenAIRE APIs can be accessed over HTTPS both by authenticated and unauthenticated requests.
                 To achieve <b>better rate limits</b> you need to make <b>authenticated requests</b>.
-                <p><span uk-icon="icon:info"></span> For more information please read the <a href="">documentation</a>.</p>
-
             </div>
+
             <div class="uk-container uk-container-small uk-margin-top">
+
+                <div class="uk-alert-primary uk-alert uk-margin-top-remove">
+                    <span uk-icon="info"></span>
+                    <span class="uk-margin-small-left">For more information please read the <a href="https://develop.openaire.eu/authentication.html" target="_blank">OpenAIRE API Authentication documentation</a>.</span>
+                </div>
+
                 <div class="uk-grid uk-child-width-1-2@m uk-child-width-1-1" uk-grid>
                     <div>
                         <div class="uk-card uk-card-default uk-card-body">
@@ -62,6 +67,7 @@
                         </div>
                     </div>
                 </div>
+
             </div>
             <!-- END OF CENTER SIDE -->
         </div>
diff --git a/src/main/webapp/personal.jsp b/src/main/webapp/personal.jsp
index 5484e9b..caf7a7a 100644
--- a/src/main/webapp/personal.jsp
+++ b/src/main/webapp/personal.jsp
@@ -87,7 +87,7 @@
                         <span uk-icon="info"></span>
                         <span class="uk-margin-small-left">
                             For further information on how to use the tokens please visit the
-                            <a href="">OpenAIRE API Authentication documentation</a>.
+                            <a href="https://develop.openaire.eu/personalToken.html" target="_blank">OpenAIRE API Authentication documentation</a>.
                         </span>
                     </div>
                     <form id="revoke" name="revoke" action="./personalToken" method="post">
diff --git a/src/main/webapp/registerService.jsp b/src/main/webapp/registerService.jsp
index dbdcfb5..aa716ea 100644
--- a/src/main/webapp/registerService.jsp
+++ b/src/main/webapp/registerService.jsp
@@ -220,10 +220,10 @@
     function checkRadio() {
         var securityLevel = $('input[type=radio][name=security_level]:checked').val();
         if(securityLevel === 'basic') {
-            $("#security-hint").html('Register your service to get a client id and a client secret. Use the client id and secret to make your requests. <a href="" target="_blank">Read more...</a>');
+            $("#security-hint").html('Register your service to get a client id and a client secret. Use the client id and secret to make your requests. <a href="https://develop.openaire.eu/basic.html" target="_blank">Read more...</a>');
             $("#public-key").hide();
         } else {
-            $("#security-hint").html('Register your service to get a client id. Declare your public key and instead of using the client secret to make a request, send a client assertion (JWT) signed with your private key. <a href="" target="_blank">Read more...</a>');
+            $("#security-hint").html('Register your service to get a client id. Declare your public key and instead of using the client secret to make a request, send a client assertion (JWT) signed with your private key. <a href="https://develop.openaire.eu/advanced.html" target="_blank">Read more...</a>');
             var keyType = $('input[type=radio][name=key_type]:checked').val();
             $("#public-key").show();
             if (keyType === 'uri') {
diff --git a/src/main/webapp/registeredServices.jsp b/src/main/webapp/registeredServices.jsp
index dcba87a..e2899de 100644
--- a/src/main/webapp/registeredServices.jsp
+++ b/src/main/webapp/registeredServices.jsp
@@ -45,9 +45,11 @@
                             <div class="uk-text-danger uk-margin-small-bottom">${message}</div>
                             <c:remove var="message" scope="session"/>
                         </c:if>
-                        <div class="uk-alert-primary uk-flex uk-flex-middle">
+
+                        <div class="uk-alert-primary uk-alert uk-margin-top-remove uk-flex uk-flex-middle">
                             <span uk-icon="info"></span>
-                            <span class="uk-margin-small-left">You can register up to 5 services.</span>
+                            <span class="uk-margin-small-left">You can register up to 5 services.
+                            For more information please read the <a href="https://develop.openaire.eu/authentication.html" target="_blank">OpenAIRE API Authentication documentation</a>.</span>
                         </div>
                         <c:if test="${reachedLimit}">
                             <div class="uk-alert-warning uk-flex uk-flex-middle uk-margin-small-top">