Added support for login page