Added user name back after error fix