CR/GH fixes to properly work with app credentials