Fix: impossible to validate a block when salt & password were different
More cleaning