Get user needs enabling/disabling correctly in firefox
Merge commit '5ea35d900f11a7c1d8feddd63f8ce1a595501e2e' into HEAD