Added detection of username