Makes sure if user cancels login it asks them again.
Merge branch 'fix/login' into develop