[BUGFIX] Check default salting method first