1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/ui/TemplateSetScreen.java b/src/main/ui/TemplateSetScreen.java
index a0b39c1..30d25b9 100644
--- a/src/main/ui/TemplateSetScreen.java
+++ b/src/main/ui/TemplateSetScreen.java
@@ -2,6 +2,7 @@ package ui;
 
 import model.asn1.exceptions.ParseException;
 import model.ca.Template;
+import model.x501.Name;
 
 /**
  * The screen that modifies the properties of a single template and add it to the store.
@@ -36,7 +37,11 @@ public class TemplateSetScreen implements UIHandler {
      */
     private void handleSetSubject(String val) {
         try {
-            template = new Template(template.getName(), template.isEnabled(), val, template.getValidity());
+            if (val == null) {
+                template = new Template(template.getName(), template.isEnabled(), (Name) null, template.getValidity());
+            } else {
+                template = new Template(template.getName(), template.isEnabled(), val, template.getValidity());
+            }
         } catch (ParseException e) {
             System.out.println(e.getMessage());
         }
@@ -94,6 +99,7 @@ public class TemplateSetScreen implements UIHandler {
     @Override
     public void commit() {
         session.getCa().addTemplate(template);
+        session.setUnsaved(true);
         session.setScreen(Screen.TEMPLATES);
     }