diff --git a/app/extensions/app_languages.php b/app/extensions/app_languages.php
index 9127337397..ac27cffeea 100644
--- a/app/extensions/app_languages.php
+++ b/app/extensions/app_languages.php
@@ -367,10 +367,10 @@
 	$text['description-hold_music']['pt-pt'] = "Escolha a categoria MOH da música aqui.";
 	$text['description-hold_music']['fr-fr'] = "Choisir la catégorie de musique de garde.";
 
-	$text['label-user_context']['en-us'] = "User Context";
-	$text['label-user_context']['es-cl'] = "Contexto de Usuario";
-	$text['label-user_context']['pt-pt'] = "Contexto do Utilizador";
-	$text['label-user_context']['fr-fr'] = "Contexte Utilisateur";
+	$text['label-user_context']['en-us'] = "Context";
+	$text['label-user_context']['es-cl'] = "Contexto";
+	$text['label-user_context']['pt-pt'] = "Contexto";
+	$text['label-user_context']['fr-fr'] = "Contexte";
 
 	$text['description-user_context']['en-us'] = "Enter the user context here.";
 	$text['description-user_context']['es-cl'] = "Ingrese el contexto de usuario aquí.";
diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php
index 2cb6848474..e616c21fe6 100644
--- a/app/extensions/extensions.php
+++ b/app/extensions/extensions.php
@@ -82,6 +82,7 @@ require_once "resources/paging.php";
 			$sql .= "and (";
 			$sql .= "	extension like '%".$search."%' ";
 			$sql .= " 	or call_group like '%".$search."%' ";
+			$sql .= " 	or user_context like '%".$search."%' ";
 			$sql .= " 	or enabled like '%".$search."%' ";
 			$sql .= " 	or description like '%".$search."%' ";
 			$sql .= ") ";
@@ -114,6 +115,7 @@ require_once "resources/paging.php";
 			$sql .= "and (";
 			$sql .= "	extension like '%".$search."%' ";
 			$sql .= " 	or call_group like '%".$search."%' ";
+			$sql .= " 	or user_context like '%".$search."%' ";
 			$sql .= " 	or enabled like '%".$search."%' ";
 			$sql .= " 	or description like '%".$search."%' ";
 			$sql .= ") ";
@@ -141,6 +143,7 @@ require_once "resources/paging.php";
 		echo th_order_by('extension', $text['label-extension'], $order_by, $order);
 		echo th_order_by('call_group', $text['label-call_group'], $order_by, $order);
 		//echo th_order_by('voicemail_mail_to', $text['label-voicemail_mail_to'], $order_by, $order);
+		echo th_order_by('user_context', $text['label-user_context'], $order_by, $order);
 		echo th_order_by('enabled', $text['label-enabled'], $order_by, $order);
 		echo th_order_by('description', $text['label-description'], $order_by, $order);
 		echo "<td class='list_control_icons'>\n";
@@ -164,6 +167,7 @@ require_once "resources/paging.php";
 				echo "</td>\n";
 				echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_group']."&nbsp;</td>\n";
 				//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['voicemail_mail_to']."&nbsp;</td>\n";
+				echo "	<td valign='top' class='".$row_style[$c]."'>".ucwords($row['user_context'])."</td>\n";
 				echo "	<td valign='top' class='".$row_style[$c]."'>".ucwords($row['enabled'])."</td>\n";
 				echo "	<td valign='top' class='row_stylebg' width='30%'>".$row['description']."&nbsp;</td>\n";
 				echo "	<td class='list_control_icons'>";