Added username to Config

Refactor loginEmail and loginPassword to use getOptionalUserContainer