Tidied authentication messages