diff --git a/CHANGELOG.md b/CHANGELOG.md
index be0750bec..5090a4b06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ### Development versions after the 0.10.2 release
 
+#### Build 2009100
+
+-   Fixed sunrise mode not reinitializing
+-   Fixed passwords not clearable
+
 #### Build 2009070
 
 -   New Segments are now initialized with default speed and intensity
diff --git a/wled00/led.cpp b/wled00/led.cpp
index d11cefe08..7b359faee 100644
--- a/wled00/led.cpp
+++ b/wled00/led.cpp
@@ -225,7 +225,7 @@ void handleNightlight()
       nightlightDelayMs = (int)(nightlightDelayMins*60000);
       nightlightActiveOld = true;
       briNlT = bri;
-      for (byte i=0; i<4; i++) colNlT[i] = col[i];                                     // remember starting color
+      for (byte i=0; i<4; i++) colNlT[i] = col[i]; // remember starting color
       if (nightlightMode == NL_MODE_SUN)
       {
         //save current
@@ -233,6 +233,7 @@ void handleNightlight()
         colNlT[1] = effectSpeed;
         colNlT[2] = effectPalette;
 
+        strip.setMode(strip.getMainSegmentId(), FX_MODE_STATIC); //make sure seg runtime is reset if left in sunrise mode
         effectCurrent = FX_MODE_SUNRISE;
         effectSpeed = nightlightDelayMins;
         effectPalette = 0;
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 763162f10..415258316 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -22,7 +22,8 @@ bool isAsterisksOnly(const char* str, byte maxLen)
     if (str[i] == 0) break;
     if (str[i] != '*') return false;
   }
-  return true;
+  //at this point the password contains asterisks only
+  return (str[0] != 0); //false on empty string
 }
 
 
diff --git a/wled00/wled.h b/wled00/wled.h
index bdbc9b861..11449e798 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2009070
+#define VERSION 2009100
 
 // ESP8266-01 (blue) got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.4.2 and the setting 512K(No SPIFFS).