[CLEANUP] Remove code duplication in saltedpasswords