Updated for new user name handling.