Small changes to Login functionality