Modified Message-Event handling to be compatible with single user mode