fixed user naming conflict