Fixed conflict with panopoly_users