diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index 0bb8e58..e6d9b96 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -354,7 +354,8 @@ define(function(require){
 			monster.ui.protectField(templateDevice.find('#sip_password'), templateDevice);
 
 			templateDevice.find('[data-toggle="tooltip"]').tooltip();
-			templateDevice.find('#mac_address').mask("hh:hh:hh:hh:hh:hh", {placeholder:" "});
+			templateDevice.find('#mac_address').mask("hh:hh:hh:hh:hh:hh", { placeholder:" " });
+			templateDevice.find('.chosen-feature-key-user').chosen({ search_contains: true });
 
 			if(!(data.media.encryption.enforce_security)) {
 				templateDevice.find('#rtp_method').hide();
diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html
index 821a53c..2bf431e 100644
--- a/views/devices-sip_device.html
+++ b/views/devices-sip_device.html
@@ -257,7 +257,7 @@
 						</select>
 						<div class="feature-key-value" data-type="presence">
 							<label for="provision.feature_keys[{{@key}}].value">{{ ../i18n.devices.popupSettings.featureKeys.labels.user }}</label>
-							<select name="provision.feature_keys[{{@key}}].value">
+							<select name="provision.feature_keys[{{@key}}].value" class="chosen-feature-key-user">
 							{{#each ../../extra.users}}
 								<option value="{{id}}">{{first_name}} {{last_name}}</option>
 							{{/each}}
@@ -273,7 +273,7 @@
 						</div>
 						<div class="feature-key-value" data-type="personal_parking">
 							<label for="provision.feature_keys[{{@key}}].value">{{ ../i18n.devices.popupSettings.featureKeys.labels.user }}</label>
-							<select name="provision.feature_keys[{{@key}}].value">
+							<select name="provision.feature_keys[{{@key}}].value" class="chosen-feature-key-user">
 							{{#each ../../extra.users}}
 								<option value="{{id}}">{{first_name}} {{last_name}}</option>
 							{{/each}}