Fix #35. Add two more login scenarios