check_login merge changes