Fixed issues on Passport UI