Fixes #4352 - cannot create and update template