Fix payment form and devise error messages