Fix remove user query for 2.4