User leave fix