Added username adding and removing - Following file will update accordingly