Combine username validation with the one introduced for emails used as username
Combine username validation with the one introduced for emails used as username

c2corg/v6_api,c2corg/v6_api,c2corg/v6_api