Implement suggestion made by Jörg Heuer in Credentials presentation.