Start of work to use email instead of username