added passport and login support