diff --git a/Disco.Models/UI/Config/DocumentTemplate/ConfigDocumentTemplateCreateModel.cs b/Disco.Models/UI/Config/DocumentTemplate/ConfigDocumentTemplateCreateModel.cs
index 68fb7615..2014c091 100644
--- a/Disco.Models/UI/Config/DocumentTemplate/ConfigDocumentTemplateCreateModel.cs
+++ b/Disco.Models/UI/Config/DocumentTemplate/ConfigDocumentTemplateCreateModel.cs
@@ -14,7 +14,7 @@ namespace Disco.Models.UI.Config.DocumentTemplate
 
         List<string> Scopes { get; }
 
-        List<Repository.JobType> GetJobTypes { get; }
-        List<Repository.JobSubType> GetJobSubTypes { get; }
+        List<Repository.JobType> GetJobTypes();
+        List<Repository.JobSubType> GetJobSubTypes();
     }
 }
diff --git a/Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs b/Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs
index 4c172110..17008554 100644
--- a/Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs
+++ b/Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs
@@ -152,13 +152,9 @@ namespace Disco.Web.Areas.Config.Controllers
 
                     Database.DocumentTemplates.Add(model.DocumentTemplate);
 
-                    if (model.DocumentTemplate.Scope == Disco.Models.Repository.DocumentTemplate.DocumentTemplateScopes.Job)
+                    if (model.DocumentTemplate.Scope == DocumentTemplate.DocumentTemplateScopes.Job)
                     {
-                        var jobSubTypes = new List<Disco.Models.Repository.JobSubType>();
-                        jobSubTypes.AddRange(model.GetJobSubTypes);
-                        model.DocumentTemplate.JobSubTypes = jobSubTypes;
-                        //foreach (var jobSubType in model.GetJobSubTypes)
-                        //    model.AttachmentType.JobSubTypes.Add(jobSubType);
+                        model.DocumentTemplate.JobSubTypes = model.GetJobSubTypes();
                     }
 
                     Database.SaveChanges();
diff --git a/Disco.Web/Areas/Config/Models/DocumentTemplate/CreateModel.cs b/Disco.Web/Areas/Config/Models/DocumentTemplate/CreateModel.cs
index c08fe793..cbfad092 100644
--- a/Disco.Web/Areas/Config/Models/DocumentTemplate/CreateModel.cs
+++ b/Disco.Web/Areas/Config/Models/DocumentTemplate/CreateModel.cs
@@ -30,29 +30,22 @@ namespace Disco.Web.Areas.Config.Models.DocumentTemplate
             }
         }
 
-        public List<Disco.Models.Repository.JobType> GetJobTypes
+        public List<Disco.Models.Repository.JobType> GetJobTypes()
         {
-            get
-            {
-                if (Types != null)
-                {
-                    var types = this.Types;
-                    return this.JobTypes.Where(m => types.Contains(m.Id)).ToList();
-                }
-                return null;
-            }
+            var types = Types;
+            if (types != null && types.Count > 0)
+                return JobTypes.Where(m => types.Contains(m.Id)).ToList();
+            else
+                return new List<Disco.Models.Repository.JobType>(JobTypes);
         }
-        public List<Disco.Models.Repository.JobSubType> GetJobSubTypes
+
+        public List<Disco.Models.Repository.JobSubType> GetJobSubTypes()
         {
-            get
-            {
-                if (SubTypes != null)
-                {
-                    var subTypes = this.SubTypes;
-                    return this.JobSubTypes.Where(m => subTypes.Contains(String.Format("{0}_{1}", m.JobTypeId, m.Id))).ToList();
-                }
-                return null;
-            }
+            var subTypes = SubTypes;
+            if (subTypes != null && subTypes.Count > 0)
+                return JobSubTypes.Where(m => subTypes.Contains($"{m.JobTypeId}_{m.Id}")).ToList();
+            else
+                return new List<Disco.Models.Repository.JobSubType>(JobSubTypes);
         }
 
         public void UpdateModel(DiscoDataContext Database)