diff --git a/application/src/main/data/json/system/widget_bundles/input_widgets.json b/application/src/main/data/json/system/widget_bundles/input_widgets.json
index 5129ea19a7..59830b4748 100644
--- a/application/src/main/data/json/system/widget_bundles/input_widgets.json
+++ b/application/src/main/data/json/system/widget_bundles/input_widgets.json
@@ -292,6 +292,22 @@
         "dataKeySettingsSchema": "{}\n",
         "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Random\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Web Camera Input\",\"showTitleIcon\":false,\"titleIcon\":\"more_horiz\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"24px\",\"titleTooltip\":\"\",\"dropShadow\":true,\"enableFullscreen\":false,\"widgetStyle\":{},\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"useDashboardTimewindow\":true,\"displayTimewindow\":true,\"showLegend\":false,\"actions\":{}}"
       }
+    },
+    {
+      "alias": "device_claiming_widget",
+      "name": "Device claiming widget",
+      "descriptor": {
+        "type": "static",
+        "sizeX": 7.5,
+        "sizeY": 4,
+        "resources": [],
+        "templateHtml": "<form name=\"claimDeviceForm\" class=\"claim-form\" ng-submit=\"claim()\">\n    <fieldset ng-disabled=\"$root.loading || loading\">\n        <md-input-container class=\"md-block\">\n            <label>Device name</label>\n                <input ng-model=\"deviceObj.deviceName\" name=\"deviceName\" required>\n                <div ng-messages=\"claimDeviceForm.deviceName.$error\">\n                    <div ng-message=\"required\">Device name is required.</div>\n                </div>\n        </md-input-container>\n        <md-input-container ng-if=\"deviceSecretField\" class=\"md-block\">\n            <label>Device secret</label>\n            <input name=\"deviceSecret\" ng-model=\"deviceObj.deviceSecret\" required>\n            <div ng-messages=\"claimDeviceForm.deviceSecret.$error\">\n                <div ng-message=\"required\">Device secret is required.</div>\n            </div>\n        </md-input-container>\n    </fieldset>\n    <md-button type=\"submit\" ng-disabled=\"loading || claimDeviceForm.$invalid || !claimDeviceForm.$dirty\" class=\"md-raised md-primary\">Claim</md-button>\n</form>",
+        "templateCss": ".claim-form {\n    margin: 16px;\n}",
+        "controllerScript": "let $scope;\n\nself.onInit = function() {\n    $scope = self.ctx.$scope;\n    let $injector = $scope.$injector;\n    let $q = $injector.get('$q');\n    let $http = $injector.get('$http');\n    let toast = $scope.$injector.get('toast');\n    $scope.deviceSecretField = self.ctx.settings.deviceSecret;\n    $scope.deviceObj = {};\n    \n    $scope.claim = () => {\n        $scope.loading = true;\n        claimDevice($scope.deviceObj.deviceName, $scope.deviceObj.deviceSecret).then(\n            (data) => {\n                resetForm();\n                $scope.claimDeviceForm.$setPristine();\n                $scope.claimDeviceForm.$setUntouched();\n                $scope.loading = false;\n                if (data.response == \"SUCCESS\") {\n                    toast.showSuccess('Device was successfully claimed!', 2000, angular.element('.claim-form'), 'bottom left');\n                }\n            },\n            () => {\n                $scope.loading = false;\n            }\n        );\n    }\n    \n    function claimDevice(deviceName, deviceSecret, config) {\n        let deferred = $q.defer();\n        let url = \"/api/customer/device/\" + deviceName + \"/claim\";\n        let obj = deviceSecret ? { secretKey: deviceSecret } : {};\n        $http.post(url, obj, config).then(\n            (payload) => {\n                deferred.resolve(payload.data); \n            },\n            () => {\n                deferred.reject();\n            }\n        );\n        return deferred.promise;\n    }\n    \n    function resetForm() {\n        $scope.deviceObj = {};\n    }\n}\n\n",
+        "settingsSchema": "{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"required\": [],\n        \"properties\": {\n            \"deviceSecret\": {\n                \"title\": \"Add 'Device secret' field\",\n                \"type\": \"boolean\",\n                \"default\": false\n            }\n        }\n    },\n    \"form\": [\n        \"deviceSecret\"\n    ]\n}",
+        "dataKeySettingsSchema": "{}\n",
+        "defaultConfig": "{\"datasources\":[{\"type\":\"static\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Random\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"deviceSecret\":true},\"title\":\"Device claiming widget\",\"dropShadow\":true,\"showTitleIcon\":false,\"titleIcon\":\"more_horiz\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"24px\",\"titleTooltip\":\"\",\"enableFullscreen\":false,\"enableDataExport\":true,\"widgetStyle\":{},\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"useDashboardTimewindow\":true,\"displayTimewindow\":true,\"showLegend\":false,\"actions\":{}}"
+      }
     }
   ]
-}
+}
\ No newline at end of file