diff --git a/apps/aqhome-react/units/u_suntime.c b/apps/aqhome-react/units/u_suntime.c
index c39a44d..a1acc58 100644
--- a/apps/aqhome-react/units/u_suntime.c
+++ b/apps/aqhome-react/units/u_suntime.c
@@ -127,7 +127,10 @@ int _cbProcess(AQHREACT_UNIT *unit)
   if (xunit) {
     if (unit && AQHREACT_Unit_InputHasChanged(unit)) {
       int rv;
-  
+
+      if (AQHREACT_Unit_GetGpInt(unit)==-1)
+        _readParams(unit);
+
       rv=_checkState(unit);
       AQHREACT_Unit_ClearChangeFlagsInUnitAndInputPorts(unit);
       return rv;
@@ -200,16 +203,16 @@ void _updateSuntimes(AQHREACT_UNIT *unit)
     GWEN_Date_free(xunit->date);
     xunit->date=GWEN_Date_CurrentDate();
 
-    _readParams(unit);
-
     t=AQHomeReact_GetSunriseTimeForDateAndLoc(xunit->date, xunit->latitude, xunit->longitude);
     xunit->sunRiseTimeInMinutes=_gwenTimeToMinutes(t);
-    DBG_INFO(NULL, "Sunrise at %02d:%02d", xunit->sunRiseTimeInMinutes/60, xunit->sunRiseTimeInMinutes%60);
+    DBG_INFO(NULL, "%s: Sunrise today at %02d:%02d UTC",
+             GWEN_Date_GetString(xunit->date), xunit->sunRiseTimeInMinutes/60, xunit->sunRiseTimeInMinutes%60);
     GWEN_Time_free(t);
 
     t=AQHomeReact_GetSunsetTimeForDateAndLoc(xunit->date, xunit->latitude, xunit->longitude);
     xunit->sunSetTimeInMinutes=_gwenTimeToMinutes(t);
-    DBG_INFO(NULL, "Sunset at %02d:%02d", xunit->sunSetTimeInMinutes/60, xunit->sunSetTimeInMinutes%60);
+    DBG_INFO(NULL, "%s: Sunset today at %02d:%02d UTC",
+             GWEN_Date_GetString(xunit->date), xunit->sunSetTimeInMinutes/60, xunit->sunSetTimeInMinutes%60);
     GWEN_Time_free(t);
 
   }
@@ -258,6 +261,7 @@ void _readParams(AQHREACT_UNIT *unit)
 
   xunit=GWEN_INHERIT_GETDATA(AQHREACT_UNIT, AQHREACT_UNIT_SUNTIME, unit);
   if (xunit) {
+    DBG_INFO(NULL, "Reading parameters");
     /* default to "Neues Rathaus" Celle ;-) */
     xunit->latitude=AQHREACT_Unit_GetParamValueDouble(unit, AQHOMEREACT_UNIT_SUNTIME_PARAM_LAT, 52.619425);
     xunit->longitude=AQHREACT_Unit_GetParamValueDouble(unit, AQHOMEREACT_UNIT_SUNTIME_PARAM_LONG, 10.087891);