fix headers handling

- fix email confirmation warning.