Working on user name support