diff --git a/app/components/document-creator.hbs b/app/components/document-creator.hbs
index 8369acab6..53b091a60 100644
--- a/app/components/document-creator.hbs
+++ b/app/components/document-creator.hbs
@@ -14,6 +14,7 @@
     "document-creator/form"
     title=this.title
     invalidTitle=this.invalidTitle
+    invalidTemplate=this.invalidTemplate
     updateTitle=this.updateTitle
     selectedTemplate=this.template
     options=this.templateOptions
diff --git a/app/components/document-creator.js b/app/components/document-creator.js
index 81a1745f9..dd9f6e87d 100644
--- a/app/components/document-creator.js
+++ b/app/components/document-creator.js
@@ -15,6 +15,7 @@ export default class DocumentCreatorComponent extends Component {
   @tracked template;
   @tracked templateOptions = [];
   @tracked invalidTitle;
+  @tracked invalidTemplate;
   @tracked errorSaving;
 
   @service store;
@@ -45,6 +46,7 @@ export default class DocumentCreatorComponent extends Component {
   @action
   onSelectTemplate(template) {
     this.template = template;
+    this.validateTemplate();
   }
 
   get isSaving() {
@@ -59,9 +61,17 @@ export default class DocumentCreatorComponent extends Component {
     }
   }
 
+  validateTemplate() {
+    if (this.template) {
+      this.invalidTemplate = false;
+    } else {
+      this.invalidTemplate = true;
+    }
+  }
   validateForm() {
     this.validateTitle();
-    return !this.invalidTitle;
+    this.validateTemplate();
+    return !this.invalidTemplate && !this.invalidTitle;
   }
 
   @action
diff --git a/app/components/document-creator/form.hbs b/app/components/document-creator/form.hbs
index 18c5c9a15..24b6ee9de 100644
--- a/app/components/document-creator/form.hbs
+++ b/app/components/document-creator/form.hbs
@@ -10,11 +10,12 @@
   </div>
   <div>
     {{#let (unique-id) as |id|}}
-      <AuLabel for={{id}}>
+      <AuLabel @error={{@invalidTemplate}} for={{id}}>
         {{t "documentCreator.template"}}
+        <RequiredField />        
       </AuLabel>
       <PowerSelect
-
+        class={{if @invalidTemplate "u-c-input au-c-input--error"}}
         @options={{@options}}
         @selected={{@selectedTemplate}}
         @onChange={{@onSelectTemplate}}