Changed login scheme 2