fix user name inclusion bug