Satya - bug fixes

Relationship for no credit card case