Release 3 WIP Update 3.3 Hotfix 1

- Hotfix for loading credentials