Small changes in login functionality