Fix pay form Closes #2225