diff --git a/template.tex b/template.tex
index ed96969..0a27f8d 100644
--- a/template.tex
+++ b/template.tex
@@ -63,7 +63,12 @@
 [# endif #]
 
 % Include a list of keywords after the abstract
+[# if doc.keywords #]
 \keywords{[-doc.keywords|join(", ")-]}
+[# else #]
+\keywords{}
+[# endif #]
+
 
 
 [-CONTENT-]
diff --git a/template.yml b/template.yml
index 701e62f..2e3123f 100644
--- a/template.yml
+++ b/template.yml
@@ -4,7 +4,7 @@ description: >-
   A template using the styles provided by the SPIE for publications in their
   proceedings
 authors:
-  - name: SPIE
+  - name: SPIE Society
     website: https://www.spie.org/
     affiliations:
       - SPIE