include usernameCanonical again
include usernameCanonical
include usernameCanonical in UserManager
Merge branch 'username' into develop
include usernameCanonical in UserManager