Username messaging tidied

Logout still not operational