Fix entity user (Yeah, again)