diff --git a/portals/devportal/src/main/webapp/site/public/locales/en.json b/portals/devportal/src/main/webapp/site/public/locales/en.json
index 7a88d84e4f7..de31438f3f1 100644
--- a/portals/devportal/src/main/webapp/site/public/locales/en.json
+++ b/portals/devportal/src/main/webapp/site/public/locales/en.json
@@ -1008,6 +1008,7 @@
   "Shared.AppsAndKeys.ViewCurl.copy.to.clipboard": "Copy to clipboard",
   "Shared.AppsAndKeys.ViewCurl.error": "Please generate the Consumer Key and Secret for Residence Key Manager with selecting the urn:ietf:params:oauth:grant-type:token-exchange grant type in order to use the token Exchange Approach.",
   "Shared.AppsAndKeys.ViewCurl.help": "The following cURL command shows how to generate an access token using the Password Grant type.",
+  "Shared.AppsAndKeys.ViewCurl.help.client.credentials": "The following cURL command shows how to generate an access token using the Client Credentials Grant type.",
   "Shared.AppsAndKeys.ViewCurl.help.in.a.similar": "In a similar manner, you can generate an access token using the Client Credentials grant type with the following cURL command.",
   "Shared.AppsAndKeys.ViewKeys.client.enable.client.credentials": "Enable Client Credentials grant type to generate test access tokens",
   "Shared.AppsAndKeys.ViewKeys.consumer.close.btn": "Close",
diff --git a/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewCurl.jsx b/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewCurl.jsx
index bbfc283561b..605954942f9 100755
--- a/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewCurl.jsx
+++ b/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewCurl.jsx
@@ -76,6 +76,7 @@ function ViewCurl(props) {
         defaultTokenEndpoint,
         consumerSecretMasked,
         consumerSecretRequired,
+        supportedGrantTypes,
     } = props;
     const bas64Encoded = window.btoa(consumerKey + ':' + consumerSecret);
     const [showReal, setShowReal] = useState(false);
@@ -109,127 +110,145 @@ function ViewCurl(props) {
             ? `-u "${consumerKey}:<CONSUMER_SECRET>"`
             : `-H "Authorization: Basic ${bas64Encoded}"`
     };
+    const showPasswordGrantCurl = !supportedGrantTypes || supportedGrantTypes.includes('password');
+    const showClientCredentialsGrantCurl = !supportedGrantTypes || supportedGrantTypes.includes('client_credentials');
 
     if (keyManagerConfig.alias === null) {
         return (
             <Root>
-                <Typography>
-                    <FormattedMessage
-                        id='Shared.AppsAndKeys.ViewCurl.help'
-                        defaultMessage='The following cURL command shows how to generate an access token using
-                            the Password Grant type.'
-                    />
-                </Typography>
+                {showPasswordGrantCurl && (
+                    <div>
+                        <Typography>
+                            <FormattedMessage
+                                id='Shared.AppsAndKeys.ViewCurl.help'
+                                defaultMessage='The following cURL command shows how to generate an access token using
+                                    the Password Grant type.'
+                            />
+                        </Typography>
 
-                <div className={classes.contentWrapper}>
-                    <div className={classes.code} dir='ltr'>
-                        <div>
-                            <span className={classes.command}>curl -k -X POST </span> {tokenEndpoint}
-                            <span className={classes.command}> -d </span>{' '}
-                            {'"grant_type=password&username=Username&password=Password"'}
-                        </div>
-                        {isConsumerSecretRequired ? (consumerSecretRequiredSnippet) : (
+                        <div className={classes.contentWrapper}>
+                            <div className={classes.code} dir='ltr'>
+                                <div>
+                                    <span className={classes.command}>curl -k -X POST </span> {tokenEndpoint}
+                                    <span className={classes.command}> -d </span>{' '}
+                                    {'"grant_type=password&username=Username&password=Password"'}
+                                </div>
+                                {isConsumerSecretRequired ? (consumerSecretRequiredSnippet) : (
+                                    <div>
+                                        <span className={classes.command}> -H </span>
+                                        {'"Authorization: Basic'}
+                                        <a onClick={applyReal} className={classes.encodeVisible}>
+                                            {showReal ? ' ' + bas64Encoded : ' Base64(consumer-key:consumer-secret)'}
+                                        </a>
+                                        {'"'}
+                                    </div>
+                                )}
+                            </div>
                             <div>
-                                <span className={classes.command}> -H </span>
-                                {'"Authorization: Basic'}
-                                <a onClick={applyReal} className={classes.encodeVisible}>
-                                    {showReal ? ' ' + bas64Encoded : ' Base64(consumer-key:consumer-secret)'}
-                                </a>
-                                {'"'}
+                                <Tooltip
+                                    title={
+                                        tokenCopied
+                                            ? intl.formatMessage({
+                                                defaultMessage: 'Copied',
+                                                id: 'Shared.AppsAndKeys.ViewCurl.copied',
+                                            })
+                                            : intl.formatMessage({
+                                                defaultMessage: 'Copy to clipboard',
+                                                id: 'Shared.AppsAndKeys.ViewCurl.copy.to.clipboard',
+                                            })
+                                    }
+                                    placement='right'
+                                >
+                                    <IconButton
+                                        id = 'copy-to-clipbord-icon'
+                                        aria-label='Copy to clipboard'
+                                        size="large"
+                                        onClick={() => {
+                                            navigator.clipboard.writeText(`curl -k -X POST ${tokenEndpoint} -d ` +
+                                                '"grant_type=password&username=Username&password=Password" ' +
+                                                `${getAuthSnippetString()}`).then(onCopy)
+                                        }}
+                                    >
+                                        <FileCopy color='secondary'/>
+                                    </IconButton>
+                                </Tooltip>
                             </div>
-                        )}
+                        </div>
                     </div>
+                )}
+                {showClientCredentialsGrantCurl && (
                     <div>
-                        <Tooltip
-                            title={
-                                tokenCopied
-                                    ? intl.formatMessage({
-                                        defaultMessage: 'Copied',
-                                        id: 'Shared.AppsAndKeys.ViewCurl.copied',
-                                    })
-                                    : intl.formatMessage({
-                                        defaultMessage: 'Copy to clipboard',
-                                        id: 'Shared.AppsAndKeys.ViewCurl.copy.to.clipboard',
-                                    })
-                            }
-                            placement='right'
-                        >
-                            <IconButton
-                                id = 'copy-to-clipbord-icon'
-                                aria-label='Copy to clipboard'
-                                size="large"
-                                onClick={() => {
-                                    navigator.clipboard.writeText(`curl -k -X POST ${tokenEndpoint} -d ` +
-                                        '"grant_type=password&username=Username&password=Password" ' +
-                                        `${getAuthSnippetString()}`).then(onCopy)
-                                }}
-                            >
-                                <FileCopy color='secondary'/>
-                            </IconButton>
-                        </Tooltip>
-                    </div>
-                </div>
-                <Typography>
-                    <FormattedMessage
-                        id='Shared.AppsAndKeys.ViewCurl.help.in.a.similar'
-                        defaultMessage={`In a similar manner, you can generate an access token using the
-                    Client Credentials grant type with the following cURL command.`}
-                    />
-                </Typography>
-                <div className={classes.contentWrapper}>
-                    <div className={classes.code} dir='ltr'>
-                        <div>
-                            <span className={classes.command}>curl -k -X POST </span> {tokenEndpoint}
-                            <span className={classes.command}> -d </span>{' '}
-                            {'"grant_type=client_credentials"'}
-                            {isAzureAD && (
-                              <>
-                                <span className={classes.command}> -d </span>
-                                {' '}
-                                {`"scope=api://${consumerKey}/.default"`}
-                              </>
+                        <Typography>
+                            {showPasswordGrantCurl ? (
+                                <FormattedMessage
+                                    id='Shared.AppsAndKeys.ViewCurl.help.in.a.similar'
+                                    defaultMessage={`In a similar manner, you can generate an access token using the
+                                Client Credentials grant type with the following cURL command.`}
+                                />
+                            ) : (
+                                <FormattedMessage
+                                    id='Shared.AppsAndKeys.ViewCurl.help.client.credentials'
+                                    defaultMessage='The following cURL command shows how to generate an access token using the Client Credentials Grant type.'
+                                />
                             )}
-                        </div>
-                        {isConsumerSecretRequired ? (consumerSecretRequiredSnippet) : (
+                        </Typography>
+
+                        <div className={classes.contentWrapper}>
+                            <div className={classes.code} dir='ltr'>
+                                <div>
+                                    <span className={classes.command}>curl -k -X POST </span> {tokenEndpoint}
+                                    <span className={classes.command}> -d </span>{' '}
+                                    {'"grant_type=client_credentials"'}
+                                    {isAzureAD && (
+                                      <>
+                                        <span className={classes.command}> -d </span>
+                                        {' '}
+                                        {`"scope=api://${consumerKey}/.default"`}
+                                      </>
+                                    )}
+                                </div>
+                                {isConsumerSecretRequired ? (consumerSecretRequiredSnippet) : (
+                                    <div>
+                                        <span className={classes.command}> -H </span>
+                                        {'"Authorization: Basic'}
+                                        <a onClick={applyReal} className={classes.encodeVisible}>
+                                            {showReal ? ' ' + bas64Encoded : ' Base64(consumer-key:consumer-secret)'}
+                                        </a>
+                                        {'"'}
+                                    </div>
+                                )}
+                            </div>
                             <div>
-                                <span className={classes.command}> -H </span>
-                                {'"Authorization: Basic'}
-                                <a onClick={applyReal} className={classes.encodeVisible}>
-                                    {showReal ? ' ' + bas64Encoded : ' Base64(consumer-key:consumer-secret)'}
-                                </a>
-                                {'"'}
+                                <Tooltip
+                                    title={
+                                        tokenCopied
+                                            ? intl.formatMessage({
+                                                defaultMessage: 'Copied',
+                                                id: 'Shared.AppsAndKeys.ViewCurl.copied',
+                                            })
+                                            : intl.formatMessage({
+                                                defaultMessage: 'Copy to clipboard',
+                                                id: 'Shared.AppsAndKeys.ViewCurl.copy.to.clipboard',
+                                            })
+                                    }
+                                    placement='right'
+                                >
+                                    <IconButton
+                                        id = 'copy-to-clipbord-icon'
+                                        aria-label='Copy to clipboard'
+                                        size="large"
+                                        onClick={() => {navigator.clipboard.writeText(`curl -k -X POST ${tokenEndpoint} -d ` +
+                                          '"grant_type=client_credentials"' + azureScope + ' ' +
+                                            `${getAuthSnippetString()}`).then(onCopy)
+                                        }}
+                                    >
+                                        <FileCopy color='secondary'/>
+                                    </IconButton>
+                                </Tooltip>
                             </div>
-                        )}
-                    </div>
-                    <div>
-                        <Tooltip
-                            title={
-                                tokenCopied
-                                    ? intl.formatMessage({
-                                        defaultMessage: 'Copied',
-                                        id: 'Shared.AppsAndKeys.ViewCurl.copied',
-                                    })
-                                    : intl.formatMessage({
-                                        defaultMessage: 'Copy to clipboard',
-                                        id: 'Shared.AppsAndKeys.ViewCurl.copy.to.clipboard',
-                                    })
-                            }
-                            placement='right'
-                        >
-                            <IconButton
-                                id = 'copy-to-clipbord-icon'
-                                aria-label='Copy to clipboard'
-                                size="large"
-                                onClick={() => {navigator.clipboard.writeText(`curl -k -X POST ${tokenEndpoint} -d ` +
-                                  '"grant_type=client_credentials"' + azureScope + ' ' +
-                                    `${getAuthSnippetString()}`).then(onCopy)
-                                }}
-                            >
-                                <FileCopy color='secondary'/>
-                            </IconButton>
-                        </Tooltip>
+                        </div>
                     </div>
-                </div>
+                )}
             </Root>
         );
     } else {
@@ -328,6 +347,7 @@ ViewCurl.propTypes = {
     defaultTokenEndpoint: PropTypes.string,
     consumerSecretMasked: PropTypes.bool,
     consumerSecretRequired: PropTypes.bool,
+    supportedGrantTypes: PropTypes.array,
 };
 
 export default injectIntl(ViewCurl);
diff --git a/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewKeys.jsx b/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewKeys.jsx
index 97a4b5ef83b..6fee84a64be 100755
--- a/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewKeys.jsx
+++ b/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewKeys.jsx
@@ -625,7 +625,7 @@ class ViewKeys extends React.Component {
         }
 
         // Get the grant types for the generated keys
-        const { supportedGrantTypes: supportedGrantTypesUnchanged } = keys.get(selectedTab);
+        const { supportedGrantTypes: supportedGrantTypesUnchanged = [] } = keys.get(selectedTab);
         return consumerKey && (
             <Root className={classes.inputWrapper}>
                 <Grid container spacing={3}>
@@ -663,6 +663,7 @@ class ViewKeys extends React.Component {
                                             keyType={keyType}
                                             keyManagerConfig={keyManagerConfig}
                                             consumerSecretMasked={consumerSecretRequired}
+                                            supportedGrantTypes={supportedGrantTypesUnchanged}
                                         />
                                     </DialogContentText>
                                 )}
@@ -740,19 +741,24 @@ class ViewKeys extends React.Component {
                                             />
                                         </Button>
                                     )}
-                                <Button
-                                    id='curl-to-generate-access-token-btn'
-                                    variant='outlined'
-                                    size='small'
-                                    color='grey'
-                                    className={classes.margin}
-                                    onClick={this.handleClickOpenCurl}
-                                >
-                                    <FormattedMessage
-                                        id='Shared.AppsAndKeys.ViewKeys.curl.to.generate'
-                                        defaultMessage='CURL to Generate Access Token'
-                                    />
-                                </Button>
+                                {supportedGrantTypesUnchanged
+                                    && (supportedGrantTypesUnchanged.includes('password')
+                                        || supportedGrantTypesUnchanged.includes('client_credentials'))
+                                    && (
+                                        <Button
+                                            id='curl-to-generate-access-token-btn'
+                                            variant='outlined'
+                                            size='small'
+                                            color='grey'
+                                            className={classes.margin}
+                                            onClick={this.handleClickOpenCurl}
+                                        >
+                                            <FormattedMessage
+                                                id='Shared.AppsAndKeys.ViewKeys.curl.to.generate'
+                                                defaultMessage='CURL to Generate Access Token'
+                                            />
+                                        </Button>
+                                    )}
                             </div>
                         </>
                         {supportedGrantTypesUnchanged && !supportedGrantTypesUnchanged.includes('client_credentials') && (