diff --git a/forms/common-themes/src/main/resources/theme/account/base/totp.ftl b/forms/common-themes/src/main/resources/theme/account/base/totp.ftl
index f60bad1238..d05dd8b616 100755
--- a/forms/common-themes/src/main/resources/theme/account/base/totp.ftl
+++ b/forms/common-themes/src/main/resources/theme/account/base/totp.ftl
@@ -12,7 +12,7 @@
             </thead>
             <tbody>
             <tr>
-                <td class="provider"><span class="social googleplus">Google</span></td>
+                <td class="provider"><span class="social googleplus">FreeOTP</span></td>
                 <td class="action">
                     <a id="remove-google" href="${url.totpRemoveUrl}"><i class="pficon pficon-delete"></i></a>
                 </td>
@@ -25,12 +25,12 @@
         <hr/>
 
         <ol>
-            <li>Download the <a href="http://code.google.com/p/google-authenticator/" target="_blank">Google Authenticator app</a> in your device.</li>
-            <li>Create an account in Google Authenticator and scan the barcode or the provided key below.<br/>
+            <li>Download the <a href="https://fedorahosted.org/freeotp/" target="_blank">FreeOTP app</a> in your device.</li>
+            <li>Create an account in FreeOTP and scan the barcode or type in the provided key below.<br/>
                 <img src="${totp.totpSecretQrCodeUrl}" alt="Figure: Barcode"><br/>
                 <span class="code">${totp.totpSecretEncoded}</span>
             </li>
-            <li>Enter the one-time-password provided by Google Authenticator below and click Submit to finish the setup.</li>
+            <li>Enter the one-time-password provided by FreeOTP below and click Submit to finish the setup.</li>
         </ol>
 
         <hr/>
diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl b/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl
index 9d178d795c..48482553a9 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl
+++ b/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl
@@ -30,7 +30,7 @@
     <#elseif section = "info" >
         <ol id="kc-totp-settings">
             <li>
-                <p>${rb.loginTotpStep1_1} <a href="http://code.google.com/p/google-authenticator/" target="_blank">${rb.loginTotpStep1_2}</a> ${rb.loginTotpStep1_3}</p>
+                <p>${rb.loginTotpStep1_1} <a href="https://fedorahosted.org/freeotp/" target="_blank">${rb.loginTotpStep1_2}</a> ${rb.loginTotpStep1_3}</p>
             </li>
             <li>
                 <p>${rb.loginTotpStep2}</p>
diff --git a/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties b/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties
index 7240e9d21c..ff0e6ad660 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties
+++ b/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties
@@ -47,8 +47,8 @@ invalidPasswordExisting=Invalid existing password
 invalidPasswordConfirm=Password confirmation doesn't match
 invalidTotp=Invalid authenticator code
 
-successTotp=Google authenticator configured.
-successTotpRemoved=Google authenticator removed.
+successTotp=FreeOTP authenticator configured.
+successTotpRemoved=FreeOTP authenticator removed.
 
 usernameExists=Username already exists
 emailExists=Email already exists
@@ -60,12 +60,12 @@ loginOauthTitle=Temporary access.
 loginOauthTitleHtml=Temporary access requested.  Login to grant access.
 loginForgot=Forgot
 
-loginTotpTitle=Google Authenticator Setup
+loginTotpTitle=FreeOTP Authenticator Setup
 loginTotpStep1_1=Download the
-loginTotpStep1_2=Google Authenticator app
+loginTotpStep1_2=FreeOTP Authenticator app
 loginTotpStep1_3=in your device.
-loginTotpStep2=Create an account in Google Authenticator and scan the barcode or the provided key below.
-loginTotpStep3=Enter the one-time-password provided by Google Authenticator below and click Submit to finish the setup.
+loginTotpStep2=Create an account in FreeOTP and scan the barcode or type in the provided key below.
+loginTotpStep3=Enter the one-time-password provided by FreeOTP below and click Submit to finish the setup.
 loginTotpOneTime=One-time-password
 
 loginProfileTitle=Update Account Information
@@ -91,7 +91,7 @@ errorTitle=We're sorry...
 errorTitleHtml=We're <strong>sorry</strong> ...
 errorGenericMsg=Something happened and we could not process your request.
 actionWarningHeader=Your account is not enabled.
-actionTotpWarning=You need to set up the Google Authenticator to activate your account.
+actionTotpWarning=You need to set up the FreeOTP Authenticator to activate your account.
 actionProfileWarning=You need to update your user profile to activate your account.
 actionPasswordWarning=You need to change your password to activate your account.
 actionEmailWarning=You need to verify your email address to activate your account.