style header for auth users (minimally..)
fix merge conflict