diff --git a/modules/distribution/product/src/main/resources/conf/default.json b/modules/distribution/product/src/main/resources/conf/default.json
index 639cca5f04..987c1a15d4 100644
--- a/modules/distribution/product/src/main/resources/conf/default.json
+++ b/modules/distribution/product/src/main/resources/conf/default.json
@@ -25,16 +25,24 @@
   "oauth.token_validation.refresh_token_validity": "1d",
   "oauth.scope_validator.xacml.enable": false,
   "oauth.grant_type.authorization_code.enable": true,
+  "oauth.grant_type.authorization_code.allow_public_client": true,
   "oauth.grant_type.password.enable": true,
+  "oauth.grant_type.password.allow_public_client": true,
   "oauth.grant_type.refresh_token.enable": true,
+  "oauth.grant_type.refresh_token.allow_public_client": true,
   "oauth.grant_type.client_credentials.enable": true,
+  "oauth.grant_type.client_credentials.allow_public_client": false,
   "oauth.grant_type.client_credentials.allow_refresh_tokens": false,
   "oauth.grant_type.client_credentials.allow_id_token": false,
   "oauth.grant_type.account_switch.enable": false,
+  "oauth.grant_type.account_switch.allow_public_client": true,
   "oauth.grant_type.saml_bearer.enable": true,
+  "oauth.grant_type.saml_bearer.allow_public_client": true,
   "oauth.grant_type.iwa_ntlm.enable": true,
+  "oauth.grant_type.iwa_ntlm.allow_public_client": true,
   "oauth.grant_type.iwa_ntlm.grant_handler": "org.wso2.carbon.identity.oauth2.token.handlers.grant.iwa.ntlm.NTLMAuthenticationGrantHandlerWithHandshake",
   "oauth.grant_type.jwt_bearer.enable": true,
+  "oauth.grant_type.jwt_bearer.allow_public_client": true,
   "oauth.grant_type.jwt_bearer.grant_validator": "org.wso2.carbon.identity.oauth2.grant.jwt.JWTGrantValidator",
   "oauth.grant_type.token_exchange.enable": true,
   "oauth.grant_type.token_exchange.grant_handler": "org.wso2.carbon.identity.oauth2.grant.token.exchange.TokenExchangeGrantHandler",
@@ -42,6 +50,7 @@
   "oauth.grant_type.token_exchange.allow_refresh_tokens": true,
   "oauth.grant_type.token_exchange.iat_validity_period": "1h",
   "oauth.grant_type.uma_ticket.enable": false,
+  "oauth.grant_type.uma_ticket.allow_public_client": true,
   "oauth.grant_type.uma_ticket.grant_handler": "org.wso2.carbon.identity.oauth.uma.grant.UMA2GrantHandler",
   "oauth.grant_type.uma_ticket.grant_validator": "org.wso2.carbon.identity.oauth.uma.grant.GrantValidator",
   "oauth.revoked_token_headers_in_response.enable": true,