diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
index fc89517f5e354cb56997946f185b2ec609061da4..a1818369fc0520152d1ed0adbf153a628a1cffac 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
@@ -214,6 +214,11 @@ public class TemplateController extends BaseController
 		}
 		transactionService.handleTags(template);
 
+		if(template.getTemplateGroup() == null)
+		{
+			template.setTemplateGroup(templateGroupService.getDefaultGroup());
+		}
+
 		template.updateIcon(iconService, iconImageID, builtinIconIdentifier, fontColor, templateService);
 
 		if(bindingResult.hasErrors())
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
index e170b88ceddc20176504047350515621031bbeba..3e9a4a7a421f8b80bf205056a4bbad9bd5225f38 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
@@ -100,6 +100,8 @@ public class TemplateService implements Resettable, AccessAllEntities<Template>,
 			template.setAccount(null);
 		}
 
+		template.setTemplateGroup(templateGroupService.getDefaultGroup());
+
 		getRepository().save(template);
 	}
 
diff --git a/src/main/resources/templates/templates/newTemplate.ftl b/src/main/resources/templates/templates/newTemplate.ftl
index e9435f90fbbdbedcb3a3ce10f9e092cb0b6dc736..853a81a73b5d15eb69ed0296c7b46b075e7d4650 100644
--- a/src/main/resources/templates/templates/newTemplate.ftl
+++ b/src/main/resources/templates/templates/newTemplate.ftl
@@ -39,6 +39,7 @@
                     <form name="NewTemplate" action="<@s.url '/templates/newTemplate'/>" method="post" onsubmit="return validateForm(true)">
                         <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
                         <input type="hidden" name="ID" value="<#if template.getID()??>${template.getID()?c}</#if>">
+                        <input type="hidden" name="templateGroup" value="<#if template.getTemplateGroup()??>${template.getTemplateGroup().getID()?c}</#if>">
 
                         <#-- isPayment switch -->
                         <@newTransactionMacros.isExpenditureSwitch template/>