Within CB > Configuration > General set "Name Format" to "Username Only" should be all that's necessary. This gives the added benefit of allowing users real names to remain private. You can have "Name Format" display their real name if that's what you wanted to do, but switching login to email removes the security implication behind username and makes it a unique display only name so you don't have to go to great lengths to try and hide it anymore.