Round # 1 of fixes
Missing key
Merge pull request #1173 from ORCID/ManageClientsFixes

Manage clients fixes