Add support for users that aren't named keith