diff --git a/app/extensions/app_config.php b/app/extensions/app_config.php
index b11f26f631..8d83b9e9ef 100644
--- a/app/extensions/app_config.php
+++ b/app/extensions/app_config.php
@@ -231,6 +231,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "user_record";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "hold_music";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
diff --git a/app/extensions/app_languages.php b/app/extensions/app_languages.php
index ca1914818a..a852533a4e 100644
--- a/app/extensions/app_languages.php
+++ b/app/extensions/app_languages.php
@@ -312,30 +312,35 @@
 	$text['description-call_group']['pt-pt'] = "Introduza o grupo a associar ao utilizador aqui. Grupos disponíveis por omissão: vendas, suporte, facturação.";
 	$text['description-call_group']['fr-fr'] = "Insérer le groupe d'appel de l'utilisateur. Les groupes disponibles par défaut sont: sales, support, billing.";
 
-	$text['label-record']['en-us'] = "Record";
-	$text['label-record']['es-cl'] = "Registro";
-	$text['label-record']['pt-pt'] = "Registro";
-	$text['label-record']['fr-fr'] = "Record";
+	$text['label-user_record']['en-us'] = "Record";
+	$text['label-user_record']['es-cl'] = "Registro";
+	$text['label-user_record']['pt-pt'] = "Registro";
+	$text['label-user_record']['fr-fr'] = "Record";
 
-	$text['description-record']['en-us'] = "Select inbound, outbound or all to record calls.";
-	$text['description-record']['es-cl'] = "Seleccione entrantes, salientes o para grabar todas las llamadas.";
-	$text['description-record']['pt-pt'] = "Selecione inbound, outbound ou para gravar todas as chamadas.";
-	$text['description-record']['fr-fr'] = "Sélectionnez entrants, sortants ou à enregistrer tous les appels.";
+	$text['description-user_record']['en-us'] = "Choose whether to record local, inbound, outbound, or all.";
+	$text['description-user_record']['es-cl'] = "Seleccione entrantes, salientes o para grabar todas las llamadas.";
+	$text['description-user_record']['pt-pt'] = "Selecione inbound, outbound ou para gravar todas as chamadas.";
+	$text['description-user_record']['fr-fr'] = "Sélectionnez entrants, sortants ou à enregistrer tous les appels.";
 
-	$text['label-record_all']['en-us'] = "All";
-	$text['label-record_all']['es-cl'] = "Todo";
-	$text['label-record_all']['pt-pt'] = "Tudo";
-	$text['label-record_all']['fr-fr'] = "Tout";
+	$text['label-user_record_all']['en-us'] = "All";
+	$text['label-user_record_all']['es-cl'] = "Todo";
+	$text['label-user_record_all']['pt-pt'] = "Tudo";
+	$text['label-user_record_all']['fr-fr'] = "Tout";
 
-	$text['label-record_inbound']['en-us'] = "Inbound";
-	$text['label-record_inbound']['es-cl'] = "Entrante";
-	$text['label-record_inbound']['pt-pt'] = "Entrada";
-	$text['label-record_inbound']['fr-fr'] = "Entrante";
+	$text['label-user_record_local']['en-us'] = "Local";
+	$text['label-user_record_local']['es-cl'] = "Local";
+	$text['label-user_record_local']['pt-pt'] = "Local";
+	$text['label-user_record_local']['fr-fr'] = "Local";
 
-	$text['label-record_outbound']['en-us'] = "Outbound";
-	$text['label-record_outbound']['es-cl'] = "Salida";
-	$text['label-record_outbound']['pt-pt'] = "Saída";
-	$text['label-record_outbound']['fr-fr'] = "Sortant";
+	$text['label-user_record_inbound']['en-us'] = "Inbound";
+	$text['label-user_record_inbound']['es-cl'] = "Entrante";
+	$text['label-user_record_inbound']['pt-pt'] = "Entrada";
+	$text['label-user_record_inbound']['fr-fr'] = "Entrante";
+
+	$text['label-user_record_outbound']['en-us'] = "Outbound";
+	$text['label-user_record_outbound']['es-cl'] = "Salida";
+	$text['label-user_record_outbound']['pt-pt'] = "Saída";
+	$text['label-user_record_outbound']['fr-fr'] = "Sortant";
 
 	$text['label-hold_music']['en-us'] = "Hold Music";
 	$text['label-hold_music']['es-cl'] = "Música en Espera";
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index b60efbaf1a..6c19d88023 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -80,6 +80,7 @@ else {
 			$toll_allow = check_str($_POST["toll_allow"]);
 			$call_timeout = check_str($_POST["call_timeout"]);
 			$call_group = check_str($_POST["call_group"]);
+			$user_record = check_str($_POST["user_record"]);
 			$hold_music = check_str($_POST["hold_music"]);
 			$auth_acl = check_str($_POST["auth_acl"]);
 			$cidr = check_str($_POST["cidr"]);
@@ -238,7 +239,7 @@ else {
 		}
 	}
 
-if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
+if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 
 	$msg = '';
 	if ($action == "update") {
@@ -364,6 +365,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 								$sql .= "call_timeout, ";
 							}
 							$sql .= "call_group, ";
+							$sql .= "user_record, ";
 							$sql .= "hold_music, ";
 							$sql .= "auth_acl, ";
 							$sql .= "cidr, ";
@@ -413,6 +415,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 								$sql .= "'$call_timeout', ";
 							}
 							$sql .= "'$call_group', ";
+							$sql .= "'$user_record', ";
 							$sql .= "'$hold_music', ";
 							$sql .= "'$auth_acl', ";
 							$sql .= "'$cidr', ";
@@ -514,6 +517,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 						$sql .= "call_timeout = '$call_timeout', ";
 					}
 					$sql .= "call_group = '$call_group', ";
+					$sql .= "user_record = '$user_record', ";
 					$sql .= "hold_music = '$hold_music', ";
 					$sql .= "auth_acl = '$auth_acl', ";
 					$sql .= "cidr = '$cidr', ";
@@ -681,6 +685,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$toll_allow = $row["toll_allow"];
 			$call_timeout = $row["call_timeout"];
 			$call_group = $row["call_group"];
+			$user_record = $row["user_record"];
 			$hold_music = $row["hold_music"];
 			$auth_acl = $row["auth_acl"];
 			$cidr = $row["cidr"];
@@ -1463,32 +1468,38 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "    ".$text['label-record'].":\n";
+	echo "    ".$text['label-user_record'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "    <select class='formfld' name='record'>\n";
+	echo "    <select class='formfld' name='user_record'>\n";
 	echo "    <option value=''></option>\n";
-	if ($record == "all") {
-		echo "    <option value='all' selected='selected'>".$text['label-record_all']."</option>\n";
+	if ($user_record == "all") {
+		echo "    <option value='all' selected='selected'>".$text['label-user_record_all']."</option>\n";
 	}
 	else {
-		echo "    <option value='all'>".$text['label-record_all']."</option>\n";
+		echo "    <option value='all'>".$text['label-user_record_all']."</option>\n";
 	}
-	if ($record == "inbound") {
-		echo "    <option value='inbound' selected='selected'>".$text['label-record_inbound']."</option>\n";
+	if ($user_record == "local") {
+		echo "    <option value='local' selected='selected'>".$text['label-user_record_local']."</option>\n";
 	}
 	else {
-		echo "    <option value='inbound'>".$text['label-record_inbound']."</option>\n";
+		echo "    <option value='local'>".$text['label-user_record_local']."</option>\n";
 	}
-	if ($record == "outbound") {
-		echo "    <option value='outbound' selected='selected'>".$text['label-record_outbound']."</option>\n";
+	if ($user_record == "inbound") {
+		echo "    <option value='inbound' selected='selected'>".$text['label-user_record_inbound']."</option>\n";
 	}
 	else {
-		echo "    <option value='outbound'>".$text['label-record_outbound']."</option>\n";
+		echo "    <option value='inbound'>".$text['label-user_record_inbound']."</option>\n";
+	}
+	if ($user_record == "outbound") {
+		echo "    <option value='outbound' selected='selected'>".$text['label-user_record_outbound']."</option>\n";
+	}
+	else {
+		echo "    <option value='outbound'>".$text['label-user_record_outbound']."</option>\n";
 	}
 	echo "    </select>\n";
 	echo "<br />\n";
-	echo $text['description-record']."\n";
+	echo $text['description-user_record']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";