Merged 2.x and 3.x AuthenticatedUser classes