Added remember me option in both screens