fixing the username duplication issue