User data fix