cosmetic change in error message and added cookie by default