diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm
index d0bf09100..15540ae4a 100644
--- a/wled00/data/settings_time.htm
+++ b/wled00/data/settings_time.htm
@@ -120,6 +120,7 @@
 		Current local time is <span class="times">unknown</span>.<br>
 		Latitude (N): <input name="LT" type="number" min="-66.6" max="66.6" step="0.01">
 		Longitude (E): <input name="LN" type="number" min="-180" max="180" step="0.01">
+		<div id="sun" class="times"></div>
 		<h3>Clock</h3>
 		Clock Overlay:
 		<select name="OL" onchange="Cs()">
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index 9529b1d3a..6c602b351 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -318,24 +318,25 @@ US-MST/MDT</option><option value="7">US-AZ</option><option value="8">US-PST/PDT
 max="65500" required> seconds (max. 18 hours)<br>Current local time is <span 
 class="times">unknown</span>.<br>Latitude (N): <input name="LT" type="number" 
 min="-66.6" max="66.6" step="0.01"> Longitude (E): <input name="LN" 
-type="number" min="-180" max="180" step="0.01"><h3>Clock</h3>Clock Overlay: 
-<select name="OL" onchange="Cs()"><option value="0" id="cn" selected="selected">
-None</option><option value="1" id="ca">Analog Clock</option><option value="2">
-Single Digit Clock</option><option value="3" id="cc">Cronixie Clock</option>
-</select><br><div id="coc">First LED: <input name="O1" type="number" min="0" 
-max="255" required> Last LED: <input name="O2" type="number" min="0" max="255" 
-required><br><div id="cac">12h LED: <input name="OM" type="number" min="0" 
-max="255" required><br>Show 5min marks: <input type="checkbox" name="O5"><br>
-</div>Seconds (as trail): <input type="checkbox" name="OS"><br></div><div 
-id="ccc">Cronixie Display: <input name="CX" maxlength="6"><br>
-Cronixie Backlight: <input type="checkbox" name="CB"><br></div>Countdown Mode: 
-<input type="checkbox" name="CE"><br>Countdown Goal:<br>Year: 20 <input 
-name="CY" type="number" min="0" max="99" required> Month: <input name="CI" 
-type="number" min="1" max="12" required> Day: <input name="CD" type="number" 
-min="1" max="31" required><br>Hour: <input name="CH" type="number" min="0" 
-max="23" required> Minute: <input name="CM" type="number" min="0" max="59" 
-required> Second: <input name="CS" type="number" min="0" max="59" required><br>
-<h3>Macro presets</h3><b>Macros have moved!</b><br><i>
+type="number" min="-180" max="180" step="0.01"><div id="sun" class="times">
+</div><h3>Clock</h3>Clock Overlay: <select name="OL" onchange="Cs()"><option 
+value="0" id="cn" selected="selected">None</option><option value="1" id="ca">
+Analog Clock</option><option value="2">Single Digit Clock</option><option 
+value="3" id="cc">Cronixie Clock</option></select><br><div id="coc">First LED: 
+<input name="O1" type="number" min="0" max="255" required> Last LED: <input 
+name="O2" type="number" min="0" max="255" required><br><div id="cac">12h LED: 
+<input name="OM" type="number" min="0" max="255" required><br>Show 5min marks: 
+<input type="checkbox" name="O5"><br></div>Seconds (as trail): <input 
+type="checkbox" name="OS"><br></div><div id="ccc">Cronixie Display: <input 
+name="CX" maxlength="6"><br>Cronixie Backlight: <input type="checkbox" 
+name="CB"><br></div>Countdown Mode: <input type="checkbox" name="CE"><br>
+Countdown Goal:<br>Year: 20 <input name="CY" type="number" min="0" max="99" 
+required> Month: <input name="CI" type="number" min="1" max="12" required> Day: 
+<input name="CD" type="number" min="1" max="31" required><br>Hour: <input 
+name="CH" type="number" min="0" max="23" required> Minute: <input name="CM" 
+type="number" min="0" max="59" required> Second: <input name="CS" type="number" 
+min="0" max="59" required><br><h3>Macro presets</h3><b>Macros have moved!</b>
+<br><i>
 Presets now also can be used as macros to save both JSON and HTTP API commands.
 <br>Just enter the preset id below!</i> <i>
 Use 0 for the default action instead of a preset</i><br>Alexa On/Off Preset: 
diff --git a/wled00/ntp.cpp b/wled00/ntp.cpp
index c615d59c7..3787c7a49 100644
--- a/wled00/ntp.cpp
+++ b/wled00/ntp.cpp
@@ -264,7 +264,7 @@ void checkTimers()
     lastTimerMinute = minute(localTime);
 
     // calculate sunrise and sunset at midnight (if longitude and latitude are set)
-    if (((int)longitude || (int)latitude) && ((!hour(localTime) && !minute(localTime)) || (!sunrise && !sunset))) {
+    if (((int)longitude || (int)latitude) /*&& ((!hour(localTime) && !minute(localTime)) || (!sunrise && !sunset))*/) {
       struct tm tim_0;
       tim_0.tm_year = year(localTime)-1900;
       tim_0.tm_mon = month(localTime)-1;
diff --git a/wled00/wled.h b/wled00/wled.h
index a963ef701..a2200e403 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2103080
+#define VERSION 2103081
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index bba955a0e..47d20639a 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -451,6 +451,10 @@ void getSettingsJS(byte subPage, char* dest)
     sappends('s',SET_F("LT"),tm);
     getTimeString(tm);
     sappends('m',SET_F("(\"times\")[0]"),tm);
+    if ((int)longitude || (int)latitude) {
+      sprintf_P(tm, PSTR("Sunrise: %02d:%02d Sunset: %02d:%02d"), hour(sunrise), minute(sunrise), hour(sunset), minute(sunset));
+      sappends('m',SET_F("(\"times\")[1]"),tm);
+    }
     sappend('i',SET_F("OL"),overlayCurrent);
     sappend('v',SET_F("O1"),overlayMin);
     sappend('v',SET_F("O2"),overlayMax);