CLSN-1154 : payment form fixes