salt fix

There's an 'Undefined variable' notice if salt contains '$' character.