Modified links to work with email rather than name, since email is unique