diff --git a/forms/common-themes/src/main/resources/theme/base/account/messages/messages_en.properties b/forms/common-themes/src/main/resources/theme/base/account/messages/messages_en.properties
index 9749f252d3..d0bbb37d18 100755
--- a/forms/common-themes/src/main/resources/theme/base/account/messages/messages_en.properties
+++ b/forms/common-themes/src/main/resources/theme/base/account/messages/messages_en.properties
@@ -84,7 +84,7 @@ revoke=Revoke Access
 
 configureAuthenticators=Configured Authenticators
 mobile=Mobile
-totpStep1=Install <a href="https://fedorahosted.org/freeotp/" target="_blank">FreeOTP</a> or <a href="http://code.google.com/p/google-authenticator/" target="_blank">Google Authenticator</a> on your mobile.
+totpStep1=Install <a href="https://fedorahosted.org/freeotp/" target="_blank">FreeOTP</a> or Google Authenticator on your device. Both applications are available in <a href="https://play.google.com">Google Play</a> and Apple App Store.
 totpStep2=Open the application and scan the barcode or enter the key.
 totpStep3=Enter the one-time code provided by the application and click Save to finish the setup.
 
diff --git a/forms/common-themes/src/main/resources/theme/base/login/messages/messages_en.properties b/forms/common-themes/src/main/resources/theme/base/login/messages/messages_en.properties
index 6122533a4e..006883fa5f 100755
--- a/forms/common-themes/src/main/resources/theme/base/login/messages/messages_en.properties
+++ b/forms/common-themes/src/main/resources/theme/base/login/messages/messages_en.properties
@@ -47,7 +47,7 @@ country=Country
 emailVerified=Email verified
 gssDelegationCredential=gss delegation credential
 
-loginTotpStep1=Install <a href="https://fedorahosted.org/freeotp/" target="_blank">FreeOTP</a> or <a href="http://code.google.com/p/google-authenticator/" target="_blank">Google Authenticator</a> on your mobile
+loginTotpStep1=Install <a href="https://fedorahosted.org/freeotp/" target="_blank">FreeOTP</a> or Google Authenticator on your mobile. Both applications are available in <a href="https://play.google.com">Google Play</a> and Apple App Store.
 loginTotpStep2=Open the application and scan the barcode or enter the key
 loginTotpStep3=Enter the one-time code provided by the application and click Submit to finish the setup
 loginTotpOneTime=One-time code
diff --git a/misc/HackingOnKeycloak.md b/misc/HackingOnKeycloak.md
index d6bd5dc160..dafadf3adf 100644
--- a/misc/HackingOnKeycloak.md
+++ b/misc/HackingOnKeycloak.md
@@ -39,8 +39,7 @@ Once you have received feedback from the mailing list if there's not one already
 Implement changes
 -----------------
 
-We don't currently enforce a code style in Keycloak, but a good reference is the code style used by WildFly. This can be
-retrieved from (https://github.com/wildfly/wildfly-core/tree/master/ide-configs)[https://github.com/wildfly/wildfly-core/tree/master/ide-configs].
+We don't currently enforce a code style in Keycloak, but a good reference is the code style used by WildFly. This can be retrieved from [Wildfly ide-configs](https://github.com/wildfly/wildfly-core/tree/master/ide-configs).To import formatting rules, see following [instructions](http://community.jboss.org/wiki/ImportFormattingRules)
 
 If your changes requires updates to the database read [Updating Database Schema](UpdatingDatabaseSchema.md).
 
@@ -67,4 +66,4 @@ Once you're happy with your changes go to GitHub and create a PR.
 Release Keycloak
 ----------------
 
-* [Release Process](ReleaseProcess.md)
\ No newline at end of file
+* [Release Process](ReleaseProcess.md)