Changed to using email vs id