Entity ID should now be the same as the Client ID