Enable on demand restricting for new applications only

Closes #1208