PSA after login
PSA before and after fixed