Allow emails as identifiers
Fall back on user's email address to identify them
Add apache license v2