Allow login by username or email
Fix licence ref
Declare services in the bundle