diff --git a/app/models/template.rb b/app/models/template.rb
index 0da0b23..8803467 100644
--- a/app/models/template.rb
+++ b/app/models/template.rb
@@ -169,6 +169,7 @@
       new_version.version = (self.version + 1)
       new_version.published = false 
       new_version.visibility = self.visibility # do not change the visibility 
+      new_version.is_default = self.is_default # retain the default template flag
       new_version.save!
       new_version
     else
@@ -264,7 +265,7 @@
       self.migrated = false
       self.dirty = false
       self.visibility = 0 # Organisationally visible by default
-      self.is_default = false
+      self.is_default = false if self.is_default.nil?
       self.version = 0 if self.version.nil?
       self.visibility = Template.visibilities[:organisationally_visible] if self.visibility.nil?