diff --git a/Dockerfile b/Dockerfile
index 4f4eb221e97c66daf7d2c7712dde2b036c8e9a58..5ff9d86e567d289011cb27334eb39baee856778c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM tomcat:9-jdk11
 
 RUN rm -rf /usr/local/tomcat/webapps/*
-COPY build/2.5.0/BudgetMaster-v2.5.0.war $CATALINA_HOME/webapps/ROOT.war
+COPY build/2.5.1/BudgetMaster-v2.5.1.war $CATALINA_HOME/webapps/ROOT.war
 COPY src/main/resources/config/templates/settings-docker.properties /root/.Deadlocker/BudgetMaster/settings.properties
 
 EXPOSE 8080
\ No newline at end of file
diff --git a/README.md b/README.md
index 821e6792b03c16c07fdd6f29c88afa0376c325aa..99c25ff8715186cd9e582624de3f7d3ba3460e30 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 Manage your monthly budget easily with BudgetMaster
 
 - __start:__ 17.12.16
-- __current release:__ v2.5.0 (29) from 03.12.20
+- __current release:__ v2.5.1 (30) from 12.03.21
 
 ## Key Features
 - Keep your data private - Host your own BudgetMaster server or use it in standalone mode. All data remains on your machines.
diff --git a/pom.xml b/pom.xml
index fa143cb5b172a768318253d2c798e337b6825739..eb1fd7776dbfc1786f321805543ee097d1f5b8c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.deadlocker8</groupId>
     <artifactId>BudgetMaster</artifactId>
-    <version>2.5.0</version>
+    <version>2.5.1</version>
     <name>BudgetMaster</name>
 
     <repositories>
@@ -70,7 +70,7 @@
 
         <app.versionDate>${maven.build.timestamp}</app.versionDate>
         <maven.build.timestamp.format>dd.MM.yy</maven.build.timestamp.format>
-        <app.versionCode>29</app.versionCode>
+        <app.versionCode>30</app.versionCode>
         <app.author>Robert Goldmann</app.author>
 
         <project.outputDirectory>build/${project.version}</project.outputDirectory>
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java
index de1ed12043c6c4b362bc2558a9d23f08579e6499..94712c6e571a99e738fca78fbf2fa2e515150b59 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java
@@ -37,10 +37,7 @@ public class AboutController extends BaseController
 	public String whatsNewModal(Model model)
 	{
 		final List<NewsEntry> newsEntries =  new ArrayList<>();
-		newsEntries.add(NewsEntry.createWithLocalizationKeys("news.changeType.headline", "news.changeType.description"));
-		newsEntries.add(NewsEntry.createWithLocalizationKeys("news.readonlyAccounts.headline", "news.readonlyAccounts.description"));
-		newsEntries.add(NewsEntry.createWithLocalizationKeys("news.firstUseWizard.headline", "news.firstUseWizard.description"));
-		newsEntries.add(NewsEntry.createWithLocalizationKeys("news.java11.headline", "news.java11.description"));
+		newsEntries.add(NewsEntry.createWithLocalizationKeys("news.bugfix.headline", "news.bugfix.description"));
 
 		model.addAttribute("newsEntries", newsEntries);
 		return "whatsNewModal";
diff --git a/src/main/resources/languages/news_de.properties b/src/main/resources/languages/news_de.properties
index 9911d5568eb9935f38d01819f9a9222d6364432e..3fa9ede45410faae1c31d64cd081fc331e97136c 100644
--- a/src/main/resources/languages/news_de.properties
+++ b/src/main/resources/languages/news_de.properties
@@ -2,14 +2,5 @@ news.further.information=Weitere Informationen
 news.all.releases=Alle veröffentlichten und geplanten Versionen:
 news.detailed=Ausführliches Changelog (nur auf Englisch):
 
-news.changeType.headline=Transaktionstyp ändern
-news.changeType.description=Ermöglicht es eine Transaktion in einen anderen Typ umwandeln (z.B. eine normale Transaktion in eine wiederholende Transaktion ändern).
-
-news.readonlyAccounts.headline=Deaktivierbare Konten
-news.readonlyAccounts.description=Konten können deaktiviert werden (verbietet Transaktionen hinzuzufügen oder zu löschen).
-
-news.firstUseWizard.headline=Hilfe zur ersten Benutzung
-news.firstUseWizard.description=Einfache Einführung in die Benutzung von BudgetMaster.
-
-news.java11.headline=Java 11
-news.java11.description=Das gesamte Projekt wurde auf Java 11 migriert.
\ No newline at end of file
+news.bugfix.headline=Bugfix
+news.bugfix.description=Fehler beim Speichern von Vorlagen mit Tags behoben.
diff --git a/src/main/resources/languages/news_en.properties b/src/main/resources/languages/news_en.properties
index e88629deb78cbdf12c182d525b99cf66b359cf9c..51c5f0a7365284ff038850f977a3854429ae7510 100644
--- a/src/main/resources/languages/news_en.properties
+++ b/src/main/resources/languages/news_en.properties
@@ -2,14 +2,5 @@ news.further.information=Further information
 news.all.releases=All published and planned releases:
 news.detailed=More detailed changelog (english only):
 
-news.changeType.headline=Change transaction type
-news.changeType.description=Transform a transaction to another type (e.g. change a normal transaction to a repeating one).
-
-news.readonlyAccounts.headline=Readonly accounts
-news.readonlyAccounts.description=Allow to deactivate accounts (transactions can't be added or removed from deactivated accounts).
-
-news.firstUseWizard.headline=First use wizard
-news.firstUseWizard.description=Simple introduction on how to use BudgetMaster.
-
-news.java11.headline=Java 11
-news.java11.description=Migrate the project to Java 11.
\ No newline at end of file
+news.bugfix.headline=Bugfix
+news.bugfix.description=Tags are now saved correctly when saving templates.
\ No newline at end of file
diff --git a/src/main/resources/static/js/transactions.js b/src/main/resources/static/js/transactions.js
index a1b47400f55978bb5d7900d235e106dfcbe3f30e..0145c19d59cbf3ca6f22b0146c65c5edf9cd85c3 100644
--- a/src/main/resources/static/js/transactions.js
+++ b/src/main/resources/static/js/transactions.js
@@ -367,10 +367,14 @@ function validateForm(allowEmptyAmount = false)
     }
 
     // start date
-    let isValidDate = validateDate('transaction-datepicker');
-    if(!isValidDate)
+    let datePickerId = 'transaction-datepicker';
+    if(document.getElementById(datePickerId) !== null)
     {
-        return false;
+        let isValidDate = validateDate();
+        if(!isValidDate)
+        {
+            return false;
+        }
     }
 
     // description