username_field imported when needed

Solving an issue with username_field being imported before it was previously computed.
Merge branch 'bug/username_field' into dev