diff --git a/CHANGELOG.md b/CHANGELOG.md
index 089896b59..acef7f7be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.5.4] - UNRELEASED
+## [2.5.4] - 2022-09-16
 ### Added
  - Aggiunta la possibilità di disattivare e cancellare gli orari di lavoro predefiniti
    non utilizzati.
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
    nell'inserimento di una richiesta di missione o di rimborso
  - Aggiunto codice 35R ai codici che riducono le ferie
 ### Changed
+ - Reso più robusto il cambio di menu in caso di giorno/mese/anno corrente mancante
  - Corretto orrdinamento delle datatable con data e ora in italiano
  - Aggiunti codici LAGILE e LAGILE in esportazione situazione mensile relativo a presenza a
    lavoro e in smart working
diff --git a/VERSION b/VERSION
index 83f947f7e..d21aa93cc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.4-rc5
\ No newline at end of file
+2.5.4
\ No newline at end of file
diff --git a/app/controllers/SwitchTemplate.java b/app/controllers/SwitchTemplate.java
index a4d20c1fd..e3074ac0a 100755
--- a/app/controllers/SwitchTemplate.java
+++ b/app/controllers/SwitchTemplate.java
@@ -18,6 +18,7 @@
 package controllers;
 
 import com.google.common.collect.Maps;
+import java.time.LocalDate;
 import java.util.Map;
 import models.Office;
 import models.Person;
@@ -38,9 +39,16 @@ public class SwitchTemplate extends Controller {
 
   private static void executeAction(String action) {
 
-    Integer year = Integer.parseInt(session.get("yearSelected"));
-    Integer month = Integer.parseInt(session.get("monthSelected"));
-    Integer day = Integer.parseInt(session.get("daySelected"));
+    LocalDate now = LocalDate.now();
+    Integer year = 
+        session.get("yearSelected") != null ?
+            Integer.parseInt(session.get("yearSelected")) : now.getYear();
+    Integer month = 
+        session.get("monthSelected") != null ? 
+            Integer.parseInt(session.get("monthSelected")) : now.getMonthValue();
+    Integer day = 
+        session.get("daySelected") != null ? 
+            Integer.parseInt(session.get("daySelected")) : now.getDayOfMonth();
     Long personId = Long.parseLong(session.get("personSelected"));
     Long officeId = Long.parseLong(session.get("officeSelected"));
 
diff --git a/publiccode.yml b/publiccode.yml
index fd79af890..1024b080e 100644
--- a/publiccode.yml
+++ b/publiccode.yml
@@ -4,10 +4,10 @@
 
 publiccodeYmlVersion: '0.2'
 name: epas
-releaseDate: '2022-08-16'
+releaseDate: '2022-09-16'
 url: 'https://github.com/consiglionazionaledellericerche/epas'
 applicationSuite: epas
-softwareVersion: 2.5.3
+softwareVersion: 2.5.4
 developmentStatus: stable
 softwareType: standalone/web
 platforms:
@@ -42,7 +42,7 @@ dependsOn:
   open:
     - name: PostgreSQL
       versionMin: "10.0"
-      optional: no
+      optional: false
 it:
   riuso:
     codiceIPA: cnr