diff --git a/garr/shib2idp/templates/monitoring/check_login.erb b/garr/shib2idp/templates/monitoring/check_login.erb
index ae2f61188af6b8189e60ed47ac2ebd9682152f93..071db10fd3fd6549b42eb6491d0d3663193a8277 100755
--- a/garr/shib2idp/templates/monitoring/check_login.erb
+++ b/garr/shib2idp/templates/monitoring/check_login.erb
@@ -152,7 +152,7 @@ if options.checkLdap:
         validAttrs = False
 
 # Search a valid string in the SP page and if found return 0 otherwise 2.
-if not "Politica della privacy" in html:
+if not "Politica della Privacy".lower() in html.lower:
     print "CRITICAL error while logging in user"
     sys.exit(2)
 elif validAttrs:
diff --git a/garr/shib2idp/templates/monitoring/mgmt_index.erb b/garr/shib2idp/templates/monitoring/mgmt_index.erb
index aaf57add3bb8c8c566f0d00f48ff0c3ac4807f29..76fbf660e13d0ab9d55ab19867132d13c194ade8 100644
--- a/garr/shib2idp/templates/monitoring/mgmt_index.erb
+++ b/garr/shib2idp/templates/monitoring/mgmt_index.erb
@@ -18,7 +18,7 @@
                                 <table width="100%" border="0">
                                 <tbody>
                                         <tr>
-                                                <td align="left"><a href="lockuser.php" target="_self"><img src="phpldapadmin/images/default/logo-small.png" alt="Logo" class="logo"></a></td>
+                                                <td align="left"><a href="<%= @metadata_information[lang]['orgUrl'] %>" target="_self"><img src="phpldapadmin/images/default/logo-small.png" alt="Logo" class="logo"></a></td>
                                                 <td class="imagetop">&nbsp;</td>
                                         </tr>
                                 </tbody>
diff --git a/garr/shib2idp/templates/styles/login.jsp.erb b/garr/shib2idp/templates/styles/login.jsp.erb
index 968a85907f4f368e25a180e8aee3ec40b87f58cd..f8b6122015b9c0fb71f07c07a3a798dfa6b9ac16 100644
--- a/garr/shib2idp/templates/styles/login.jsp.erb
+++ b/garr/shib2idp/templates/styles/login.jsp.erb
@@ -138,14 +138,14 @@
                 if v.is_a?(Hash) and lang != "en"
                   %>
                   <c:when test="${language == '<%=lang%>'}">
-                    <a id="logolink" class="logo" href="<%= @metadata_information[lang]['idpInfoUrl'] %>"><img id="logoimg" src="<%= @metadata_information[lang]['url_LogoOrg_160x120']%>" alt="<%= @metadata_information[lang]['orgDisplayName']%>"/></a><br/><%= @metadata_information[lang]['orgDisplayName']%>
+                    <a id="logolink" class="logo" href="<%= @metadata_information[lang]['orgUrl'] %>"><img id="logoimg" src="<%= @metadata_information[lang]['url_LogoOrg_160x120']%>" alt="<%= @metadata_information[lang]['orgDisplayName']%>"/></a><br/><%= @metadata_information[lang]['orgDisplayName']%>
                   </c:when>
                   <%
                 end
               end
               %>
               <c:otherwise>
-                <a id="logolink" class="logo" href="<%= @metadata_information['en']['idpInfoUrl'] %>"><img id="logoimg" src="<%= @metadata_information['en']['url_LogoOrg_160x120']%>" alt="<%= @metadata_information['en']['orgDisplayName']%>"/></a><br/><%= @metadata_information['en']['orgDisplayName']%>
+                <a id="logolink" class="logo" href="<%= @metadata_information['en']['orgUrl'] %>"><img id="logoimg" src="<%= @metadata_information['en']['url_LogoOrg_160x120']%>" alt="<%= @metadata_information['en']['orgDisplayName']%>"/></a><br/><%= @metadata_information['en']['orgDisplayName']%>
               </c:otherwise>
               </c:choose>
             <%% } %>