custom user data fixes