Two more fixes
Merge pull request #1677 from onepercentclub/hotfix/salesforce-directdebit

Two more fixes