Simple additions and changes to support lookup methods other than by email.

Simple additions and changes to support lookup methods other than by email.