Unified the use of encryption salt across installations. This is weak and needs more attention.