User name related bug fixed