MUSX-1 fixes and refactoring for login