added getting username without "@" in username