Move XT.username check.