Refactor login-logout
Merge pull request #83 from AndreiH/refactor_login_logout

Refactor login-logout