Re #1176 - Bugfixes on selecting wrong method to get ApiKey