Feature/3318 add cancel button to login

Closes #3318.