fixes to passport - now working