Issue #174 - Default to existing payment type