[Mocha-Foundation] Fix Login Issues