Fix form not restoring original salt