tweaks to login mechanism
resolving merge conflicts