diff --git a/circle/dashboard/forms.py b/circle/dashboard/forms.py
index 361dc23..d21cbe7 100644
--- a/circle/dashboard/forms.py
+++ b/circle/dashboard/forms.py
@@ -450,8 +450,10 @@ class TemplateForm(forms.ModelForm):
             self.allowed_fields = ()
         else:
             self.allowed_fields = (
-                'name', 'access_method', 'description', 'system', 'tags')
-        if self.user.has_perm('vm.change_template_resources'):
+                'name', 'access_method', 'description', 'system', 'tags',
+                'arch', 'lease')
+        if (self.user.has_perm('vm.change_template_resources')
+                or not self.instance.pk):
             self.allowed_fields += tuple(set(self.fields.keys()) -
                                          set(['raw_data']))
         if self.user.is_superuser:
diff --git a/circle/dashboard/views.py b/circle/dashboard/views.py
index a315f7b..a4cbc24 100644
--- a/circle/dashboard/views.py
+++ b/circle/dashboard/views.py
@@ -1376,7 +1376,7 @@ class TemplateCreate(SuccessMessageMixin, CreateView):
     def get_context_data(self, *args, **kwargs):
         context = super(TemplateCreate, self).get_context_data(*args, **kwargs)
 
-        num_leases = Lease.get_objects_with_level("user",
+        num_leases = Lease.get_objects_with_level("operator",
                                                   self.request.user).count()
         can_create_leases = self.request.user.has_perm("create_leases")
         context.update({