diff --git a/code/espurna/settings.ino b/code/espurna/settings.ino
index c8c37c2f..2878f952 100644
--- a/code/espurna/settings.ino
+++ b/code/espurna/settings.ino
@@ -114,11 +114,13 @@ std::vector<String> _settingsKeys() {
 
 bool _settingsKeyCheck(const char * key) {
     if (strncmp(key, "admin", 5) == 0) return true;
-    if (strncmp(key, "hostname", 8) == 0) return true;
     if (strncmp(key, "board", 5) == 0) return true;
+    if (strncmp(key, "cfg", 3) == 0) return true;
+    if (strncmp(key, "device", 6) == 0) return true;
+    if (strncmp(key, "fw", 2) == 0) return true;
+    if (strncmp(key, "hostname", 8) == 0) return true;
     if (strncmp(key, "loopDelay", 9) == 0) return true;
     if (strncmp(key, "wtfHeap", 7) == 0) return true;
-    if (strncmp(key, "cfg", 3) == 0) return true;
     return false;
 }