Fixed not restricting, multiple on demand dialogs

Refs #1242
Refs #1243