Merged with facebook login page working