fix passport initialization order