More work on gift subscription, added security config item