Fix bug, active user issue