Password cookie bugfix 2