Fixed multiple user name potential issue