Fix bug related to username normalization, used for equating trademark
with TradeMark