changes to login logic
merged