Fix for user data seperation