Merge pull request #1013 from ORCID/PublicClientFixes

Round # 2
Merge pull request #1014 from ORCID/PublicClientFixes

Public client fixes
Round # 1