diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index 4bf6dc1..6c4de53 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -134,7 +134,7 @@ app.service ('bridgeService', function ($rootScope, $http, $base64, $location, n
 	this.state = {base: "./api/devices", bridgelocation: ".", systemsbase: "./system", huebase: "./api", configs: [], backups: [], devices: [], device: {},
 			mapandid: [], type: "", settings: [], myToastMsg: [], logMsgs: [], loggerInfo: [], mapTypes: [], olddevicename: "", logShowAll: false,
 			isInControl: false, showVera: false, showHarmony: false, showNest: false, showHue: false, showHal: false, showMqtt: false, showHass: false,
-			showDomoticz: false, showSomfy: false, showLifx: false, habridgeversion: {}, viewDevId: "", queueDevId: "", securityInfo: {}};
+			showDomoticz: false, showSomfy: false, showLifx: false, habridgeversion: {}, viewDevId: "", queueDevId: "", securityInfo: {}, filterDevicesByIpAddress: null};
 
 	this.displayWarn = function(errorTitle, error) {
 		var toastContent = errorTitle;
@@ -3462,6 +3462,21 @@ app.filter('configuredSomfyDevices', function (bridgeService) {
 	}
 });
 
+app.filter('filterDevicesByRequester', function () {
+	return function(input,search) {
+		var out = [];
+		if(input === undefined || input === null || input.length === undefined)
+			return out;
+		var pattern = new RegExp(search);
+		for (var i = 0; i < input.length; i++) {
+			if(pattern.test(input[i].requesterAddress) || !input[i].requesterAddress || input[i].requesterAddress.length === 0){
+				out.push(input[i]);
+			}
+		}
+		return out;
+	}
+});
+
 app.controller('LoginController', function ($scope, $location, Auth) {
     $scope.failed = false;
     $scope.loggedIn = Auth.isLoggedIn();
diff --git a/src/main/resources/public/views/configuration.html b/src/main/resources/public/views/configuration.html
index a3664e7..0060600 100644
--- a/src/main/resources/public/views/configuration.html
+++ b/src/main/resources/public/views/configuration.html
@@ -31,10 +31,14 @@
 	</div>
 	<div class="panel-body">
 
-		<p>
-			<button class="btn btn-primary" type="submit" ng-click="renumberDevices()">Renumber Devices</button>
-			<button ng-if="bridge.securityInfo.useLinkButton" class="btn btn-primary" type="submit" ng-click="pushLinkButton()">Link</button>
-		</p>
+			<div class="form-group">
+				<button class="btn btn-primary" type="submit" ng-click="renumberDevices()">Renumber Devices</button>
+				<button ng-if="bridge.securityInfo.useLinkButton" class="btn btn-primary" type="submit" ng-click="pushLinkButton()">Link</button>
+				<label for="device-ip-filter">Show devices visible to: </label>
+				<input type="text" id="device-ip-filter" style="width:150px"
+							ng-model="bridge.state.filterDevicesByIpAddress" placeholder="">
+			</div>
+		
 	<scrollable-table watch="bridge.devices">
 	<table class="table table-bordered table-striped table-hover">
 		<thead>
@@ -51,7 +55,7 @@
 				<th>Actions</th>
 			</tr>
 		</thead>
-		<tr ng-repeat="device in bridge.devices" row-id="{{device.id}}" ng-class="{info: bridge.viewDevId == device.id}" >
+		<tr ng-repeat="device in bridge.devices | orderBy:'name' | filterDevicesByRequester:bridge.state.filterDevicesByIpAddress" row-id="{{device.id}}" ng-class="{info: bridge.viewDevId == device.id}" >
 			<td>{{$index+1}}</td>
 			<td>{{device.id}}</td>
 			<td>{{device.name}}</td>