Fix gift card validation #6013