Fixed issue with duplicate username