Fixed login part
Merge branch 'login-implemented'