Fix refund issue

[maxvisser]

code review done.

Waiting for someone other that hcn to test, maybe @jamalv can test also. Deploy on monday.