|#692|+Sriram| Fixing the username duplicate issue