Can we have the ability to select the custom key selection when Tenant Not Required is Selected?