fix merge problem where user cannot login