Changes: fix login mechanism