Fixing card 1680 and 1701
Merge pull request #1601 from ORCID/Card1680_Card1701

Fixing card 1680 and 1701