[TASK] Improve user handling