Added consistent header for login/logout
a
merge