Alexa Smart Home Skill Account Linking for Org Accounts

Hi All,

I have been trying to achieve Alexa Smart Home Skill Account Linking to work successfully with my Customer/Org Account under a Product ID.

Authorization URI*
Access Token URI*
Client ID* client id of the org product from the console
Client Secret* same as above
Scope* none

I am using the standard settings in the Skill but after I put the particle customer account credentials in the login page I get the invalid credentials page.

I think the authorization uri is only to login into the non org accounts. What are the correct settings to be used for org accounts under a product id?