diff --git a/i18n/en-US.json b/i18n/en-US.json
index 354abe6..c4af50d 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -1204,6 +1204,10 @@
 		"noFeatureCodeMessage": "There are no feature codes enabled on your account yet. Feature codes are automatically created when you load the Main Number page.",
 		"mainNumberLink": "Go to Main Number",
 		"labels": {
+			"directed_ext_pickup": {
+				"label": "Directed Extension Pickup",
+				"tooltip": ""
+			},
 			"qubicle login": {
 				"label": "Agent Login",
 				"tooltip": ""
diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index 0d81cc7..22d839f 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -42,6 +42,12 @@ define(function(require) {
 		],
 
 		featureCodes: [
+			{
+				name: 'directed_ext_pickup',
+				number: '87',
+				pattern: '^\\*87([0-9]+)$',
+				moduleName: 'group_pickup_feature'
+			},
 			{
 				name: 'call_forward[action=deactivate]',
 				number: '73',
@@ -1797,8 +1803,8 @@ define(function(require) {
 										name: 'popupEditFaxbox',
 										data: {
 											email: faxbox.hasOwnProperty('notifications') && faxbox.notifications.hasOwnProperty('inbound') && faxbox.notifications.inbound.hasOwnProperty('email')
-													? faxbox.notifications.inbound.email.send_to
-													: ''
+												? faxbox.notifications.inbound.email.send_to
+												: ''
 										},
 										submodule: 'strategy'
 									})),
@@ -2819,7 +2825,7 @@ define(function(require) {
 							{ value: 'last', label: self.i18n.active().strategy.ordinals.last }
 						]
 					}
-				}, holiday, {holidayType: holidayType});
+				}, holiday, { holidayType: holidayType });
 
 			for (var i = 1; i <= 31; i++) {
 				templateData.resources.days.push({ value: i });
@@ -3766,7 +3772,7 @@ define(function(require) {
 										name: val,
 										type: 'main_weekdays',
 										time_window_start: 32400, // 9:00AM
-										time_window_stop: 61200,  // 5:00PM
+										time_window_stop: 61200, // 5:00PM
 										wdays: [val.substring(4).toLowerCase()]
 									}
 								},
@@ -3965,7 +3971,7 @@ define(function(require) {
 						ring_group: [],
 						userGroups: $.map(results.userGroups, function(val) {
 							var group = _.find(results.groups, function(group) { return val.group_id === group.id; });
-							val.name = group && group.name || val.name;
+							val.name = group && (group.name || val.name);
 							val.module = 'callflow';
 							return val;
 						}),