continue login/registration workflow
Merge origin/master