add support for user name changes