Active user handling updated