Reorg of tasks for authenticated login