fixed Username/username confict