fixed user mapping