Solve loginId/userId problems