Fix user namespacing