Scabrero/fix users manage performance