diff --git a/application/src/main/data/json/system/oauth2_config_templates/facebook_config.json b/application/src/main/data/json/system/oauth2_config_templates/facebook_config.json
index 81097ccc49..9b059e81c1 100644
--- a/application/src/main/data/json/system/oauth2_config_templates/facebook_config.json
+++ b/application/src/main/data/json/system/oauth2_config_templates/facebook_config.json
@@ -5,7 +5,7 @@
   "scope": ["email","public_profile"],
   "jwkSetUri": null,
   "userInfoUri": "https://graph.facebook.com/me?fields=id,name,first_name,last_name,email",
-  "clientAuthenticationMethod": "basic",
+  "clientAuthenticationMethod": "BASIC",
   "userNameAttributeName": "email",
   "basic": {
     "emailAttributeKey": "email",
@@ -15,6 +15,6 @@
   },
   "comment": null,
   "loginButtonIcon": "mdi:facebook",
-  "loginButtonLabel": "Login with Facebook",
+  "loginButtonLabel": "Facebook",
   "helpLink": "https://developers.facebook.com/docs/facebook-login/web#logindialog"
-}
\ No newline at end of file
+}
diff --git a/application/src/main/data/json/system/oauth2_config_templates/github_config.json b/application/src/main/data/json/system/oauth2_config_templates/github_config.json
index 819ea4b6b6..58812fdc1e 100644
--- a/application/src/main/data/json/system/oauth2_config_templates/github_config.json
+++ b/application/src/main/data/json/system/oauth2_config_templates/github_config.json
@@ -5,11 +5,11 @@
   "scope": ["read:user","user:email"],
   "jwkSetUri": null,
   "userInfoUri": "https://api.github.com/user",
-  "clientAuthenticationMethod": "basic",
+  "clientAuthenticationMethod": "BASIC",
   "userNameAttributeName": "login",
   "basic": {},
   "comment": "In order to log into ThingsBoard you need to have user's email. You may configure and use Custom OAuth2 Mapper to get email information. Please refer to <a href=\"https://docs.github.com/en/rest/reference/users#list-email-addresses-for-the-authenticated-user\">Github Documentation</a>",
   "loginButtonIcon": "mdi:github",
-  "loginButtonLabel": "Login with Github",
+  "loginButtonLabel": "Github",
   "helpLink": "https://docs.github.com/en/developers/apps/creating-an-oauth-app"
-}
\ No newline at end of file
+}
diff --git a/application/src/main/data/json/system/oauth2_config_templates/google_config.json b/application/src/main/data/json/system/oauth2_config_templates/google_config.json
index 2573b5ecd0..2756bcc957 100644
--- a/application/src/main/data/json/system/oauth2_config_templates/google_config.json
+++ b/application/src/main/data/json/system/oauth2_config_templates/google_config.json
@@ -6,7 +6,7 @@
   "scope": ["email","openid","profile"],
   "jwkSetUri": "https://www.googleapis.com/oauth2/v3/certs",
   "userInfoUri": "https://openidconnect.googleapis.com/v1/userinfo",
-  "clientAuthenticationMethod": "basic",
+  "clientAuthenticationMethod": "BASIC",
   "userNameAttributeName": "email",
   "basic": {
     "emailAttributeKey": "email",
@@ -16,6 +16,6 @@
   },
   "comment": null,
   "loginButtonIcon": "mdi:google",
-  "loginButtonLabel": "Login with Google",
+  "loginButtonLabel": "Google",
   "helpLink": "https://developers.google.com/adwords/api/docs/guides/authentication"
-}
\ No newline at end of file
+}