Fixed credentials not being loaded in some methods