Fixed user name issue