Fix entity user (Baby one more time)