diff --git a/docs.it4i/get-started-with-it4innovations/obtaining-login-credentials/certificates-faq.md b/docs.it4i/get-started-with-it4innovations/obtaining-login-credentials/certificates-faq.md
index 5c8fafa301a1694a2301fa1159c8ad4ea3d69d1e..e3b3e374fa6ea3a483618d76f7e019cdde3ceaa4 100644
--- a/docs.it4i/get-started-with-it4innovations/obtaining-login-credentials/certificates-faq.md
+++ b/docs.it4i/get-started-with-it4innovations/obtaining-login-credentials/certificates-faq.md
@@ -25,7 +25,7 @@ Q: Which X.509 certificates are recognised by IT4Innovations?
 Q: How do I get a User Certificate that can be used with IT4Innovations?
 ------------------------------------------------------------------------
 
-To get a certificate, you must make a request to your local, IGTF approved, Certificate Authority (CA). Usually you then must visit, in person, your nearest Registration Authority (RA) to verify your affiliation and identity (photo identification is required). Usually, you will then be emailed details on how to retrieve your certificate, although procedures can vary between CAs. If you are in Europe, you can locate your trusted CA via <http://www.eugridpma.org/members/worldmap>.
+To get a certificate, you must make a request to your local, IGTF approved, Certificate Authority (CA). Usually you then must visit, in person, your nearest Registration Authority (RA) to verify your affiliation and identity (photo identification is required). Usually, you will then be emailed details on how to retrieve your certificate, although procedures can vary between CAs. If you are in Europe, you can locate [your trusted CA](http://www.eugridpma.org/members/worldmap).
 
 In some countries certificates can also be retrieved using the TERENA Certificate Service, see the FAQ below for the link.
 
@@ -137,7 +137,7 @@ You also can import CA certificates into your java keystore with the tool, e.g.:
 
 where $mydomain.crt is the certificate of a trusted signing authority (CA) and $mydomain is the alias name that you give to the entry.
 
-More information on the tool can be found at:<http://docs.oracle.com/javase/7/docs/technotes/tools/solaris/keytool.html>
+More information on the tool can be found [here](http://docs.oracle.com/javase/7/docs/technotes/tools/solaris/keytool.html)
 
 Q: How do I use my certificate to access the different grid Services?
 ---------------------------------------------------------------------