Fix User EFQ bug