Modification of login logic