Added support for unique username & misc changes

added support for unqie username
misc changes