Proper username detection, Moved MOTD label