diff --git a/LibreNMS/Modules/Core.php b/LibreNMS/Modules/Core.php
index 0c35c22deb..bb59f29b26 100644
--- a/LibreNMS/Modules/Core.php
+++ b/LibreNMS/Modules/Core.php
@@ -244,6 +244,10 @@ class Core implements Module
         if ($uptime > 0) {
             if ($uptime < $device->uptime) {
                 Log::event('Device rebooted after ' . Time::formatInterval($device->uptime) . " -> {$uptime}s", $device, 'reboot', 4, $device->uptime);
+                if (Config::get('discovery_on_reboot')) {
+                    $device->last_discovered = null;
+                    $device->save();
+                }
             }
 
             app('Datastore')->put($os->getDeviceArray(), 'uptime', [
diff --git a/html/mix-manifest.json b/html/mix-manifest.json
index da80285143..bf7ea4083b 100644
--- a/html/mix-manifest.json
+++ b/html/mix-manifest.json
@@ -4,12 +4,12 @@
     "/css/vendor.css": "/css/vendor.css?id=8d7b2ecb46047fe813e4",
     "/css/app.css": "/css/app.css?id=54a173acc7d587a9afa4",
     "/js/vendor.js": "/js/vendor.js?id=294cef17a3cf43045d61",
-    "/js/lang/de.js": "/js/lang/de.js?id=8959e785f5790d6b6836",
-    "/js/lang/en.js": "/js/lang/en.js?id=bd7598fcfc462394f0de",
-    "/js/lang/fr.js": "/js/lang/fr.js?id=707149152bde5b5e2b8d",
+    "/js/lang/de.js": "/js/lang/de.js?id=1aedfce25e3daad3046a",
+    "/js/lang/en.js": "/js/lang/en.js?id=9524c5b5c41772bbb465",
+    "/js/lang/fr.js": "/js/lang/fr.js?id=a20c4c78eb5f9f4a374b",
     "/js/lang/it.js": "/js/lang/it.js?id=4e3b200da489000822dd",
     "/js/lang/ru.js": "/js/lang/ru.js?id=f6b7c078755312a0907c",
-    "/js/lang/uk.js": "/js/lang/uk.js?id=c19a5dcee4724579cb41",
-    "/js/lang/zh-CN.js": "/js/lang/zh-CN.js?id=acab91683e556299b62b",
-    "/js/lang/zh-TW.js": "/js/lang/zh-TW.js?id=4d48f47a17010848f963"
+    "/js/lang/uk.js": "/js/lang/uk.js?id=1bba323982918f74fa33",
+    "/js/lang/zh-CN.js": "/js/lang/zh-CN.js?id=b4219bb8e090803ee079",
+    "/js/lang/zh-TW.js": "/js/lang/zh-TW.js?id=64b924a4a9a744aaf020"
 }
diff --git a/misc/config_definitions.json b/misc/config_definitions.json
index 6ebb18930d..c887085792 100644
--- a/misc/config_definitions.json
+++ b/misc/config_definitions.json
@@ -212,13 +212,20 @@
             "section": "rules",
             "order": 7
         },
-        "allow_duplicate_sysName": {
+        "discovery_on_reboot": {
             "default": false,
             "type": "boolean",
             "group": "discovery",
             "section": "general",
             "order": 0
         },
+        "allow_duplicate_sysName": {
+            "default": false,
+            "type": "boolean",
+            "group": "discovery",
+            "section": "general",
+            "order": 1
+        },
         "allow_entity_sensor.amperes": {
             "default": true,
             "type": "boolean"
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index 2ba166766a..693456110a 100644
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -188,6 +188,10 @@ return [
             'description' => 'Alert log entries older than',
             'help' => 'Cleanup done by daily.sh',
         ],
+        'discovery_on_reboot' => [
+            'description' => 'Discovery on Reboot',
+            'help' => 'Do a Discovery on a rebooted Device',
+        ],
         'allow_duplicate_sysName' => [
             'description' => 'Allow Duplicate sysName',
             'help' => 'By default duplicate sysNames are disabled from being added to prevent a device with multiple interfaces from being added multiple times',