add missing cases on user window change