Added login and signup support