diff --git a/app/call_center/app_languages.php b/app/call_center/app_languages.php
index baba6f05f9..c0a7cd288e 100644
--- a/app/call_center/app_languages.php
+++ b/app/call_center/app_languages.php
@@ -139,10 +139,10 @@
 	$text['option-rsring']['pt-pt'] = "rs-ring";
 	$text['option-rsring']['fr-fr'] = "rs-ring";
 
-	$text['label-record_template']['en-us'] = "Record Template";
-	$text['label-record_template']['es-cl'] = "Guardar Plantilla";
-	$text['label-record_template']['pt-pt'] = "Gravar Template";
-	$text['label-record_template']['fr-fr'] = "Modèle d'enregistrement";
+	$text['label-record_template']['en-us'] = "Record";
+	$text['label-record_template']['es-cl'] = "Guardar";
+	$text['label-record_template']['pt-pt'] = "Gravar";
+	$text['label-record_template']['fr-fr'] = "Modèle";
 
 	$text['label-tiers']['en-us'] = "Tiers";
 	$text['label-tiers']['es-cl'] = "Niveles de Centro de Llamados";
@@ -310,10 +310,10 @@
 	$text['description-music_on_hold']['pt-pt'] = "Seleccione uma música de espera.";
 	$text['description-music_on_hold']['fr-fr'] = "";
 
-	$text['description-record_template']['en-us'] = "Enter a record template. \$\${base_dir}/recordings/archive/\${strftime(%Y)}/\${strftime(%b)}/\${strftime(%d)}/\${uuid}.wav";
-	$text['description-record_template']['es-cl'] = "Introduzca una plantilla de grabación. \$\${base_dir}/recordings/archive/\${strftime(%Y)}/\${strftime(%b)}/\${strftime(%d)}/\${uuid}.wav";
-	$text['description-record_template']['pt-pt'] = "Introduza um template de gravação. \$\${base_dir}/recordings/archive/\${strftime(%Y)}/\${strftime(%b)}/\${strftime(%d)}/\${uuid}.wav";
-	$text['description-record_template']['fr-fr'] = "Entrer un modèle d\'enregistrement. \$\${base_dir}/recordings/archive/\${strftime(%Y)}/\${strftime(%b)}/\${strftime(%d)}/\${uuid}.wav";
+	$text['description-record_template']['en-us'] = "Save the recording.";
+	$text['description-record_template']['es-cl'] = "Guardar la grabación.";
+	$text['description-record_template']['pt-pt'] = "Salve a gravação.";
+	$text['description-record_template']['fr-fr'] = "Sauvegarder l'enregistrement.";
 
 	$text['description-tiers']['en-us'] = "Tiers assign agents to queues.";
 	$text['description-tiers']['es-cl'] = "Lista todos los niveles. Los niveles asignan agentes a las colas.";
diff --git a/app/call_center/call_center_queue_edit.php b/app/call_center/call_center_queue_edit.php
index bc84cc0a7e..6cd8618254 100644
--- a/app/call_center/call_center_queue_edit.php
+++ b/app/call_center/call_center_queue_edit.php
@@ -679,6 +679,24 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='queue_record_template' maxlength='255' value=\"$queue_record_template\">\n";
+
+	$record_template = $_SESSION['switch']['recordings']['dir']."/archive/\${strftime(%Y)}/\${strftime(%b)}/\${strftime(%d)}/\${uuid}.wav";
+
+	echo "	<select class='formfld' name='queue_record_template'>\n";
+	echo "	<option value=''></option>\n";
+	if (strlen($queue_record_template) > 0) {
+		echo "	<option value='$rec_template' selected='selected' >".$text['option-true']."</option>\n";
+	}
+	else {
+		echo "	<option value='$record_template'>".$text['option-true']."</option>\n";
+	}
+	if (strlen($queue_record_template) == 0) {
+		echo "	<option value='' selected='selected' >".$text['option-false']."</option>\n";
+	}
+	else {
+		echo "	<option value=''>".$text['option-false']."</option>\n";
+	}
+	echo "	</select>\n";
 	echo "<br />\n";
 	echo $text['description-record_template']."\n";
 	echo "</td>\n";
diff --git a/resources/footer.php b/resources/footer.php
index 692b40c7dd..9fbfe43a8f 100644
--- a/resources/footer.php
+++ b/resources/footer.php
@@ -33,8 +33,13 @@ require_once "resources/require.php";
 //set a default template
 	if (strlen($_SESSION['domain']['template']['name']) == 0) { $_SESSION['domain']['template']['name'] = 'default'; }
 
+//clear the template
+	if ($_SESSION['theme']['cache']['boolean'] == "false") {
+			$_SESSION["template_content"] = '';
+	}
+
 //set a default template
-	if (strlen($_SESSION["template_content"])==0) { //build template if session template has no length
+	if (strlen($_SESSION["template_content"]) == 0) { //build template if session template has no length
 		$v_template_path = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/themes';
 		if (strlen($template_rss_sub_category) > 0) {
 			//this template was assigned by the content manager