diff --git a/app/fax/app_config.php b/app/fax/app_config.php
index 75f64f9b62..b31fe4a5d8 100644
--- a/app/fax/app_config.php
+++ b/app/fax/app_config.php
@@ -505,6 +505,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "300-399";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the suggested extension range(s) for fax servers";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f91cf33c-7f89-11f0-88f8-abceb7c1c991";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "fax";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "upload_file_limit";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "5";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the upload file limit for Fax File(s)";
 
 	//schema details
 		$y=0;
@@ -979,4 +987,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index 229adda14e..5edaab7f36 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -1095,9 +1095,11 @@ if (!defined('STDIN')) {
 		echo "	".$text['label-fax_files']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		for ($f = 1; $f <= 3; $f++) {
+	
+		$upload_file_limit = (int)$settings->get('fax','upload_file_limit',5);
+		for ($f = 1; $f <= $upload_file_limit; $f++) {
 			echo "	<span id='fax_file_".$f."' ".(($f > 1) ? "style='display: none;'" : null).">";
-			echo "	<input name='fax_files[]' id='fax_files_".$f."' type='file' class='formfld fileinput' style='margin-right: 3px; ".(($f > 1) ? "margin-top: 3px;" : null)."' onchange=\"".(($f < 3) ? "document.getElementById('fax_file_".($f+1)."').style.display='';" : null)." list_selected_files(".$f.");\" multiple='multiple'>";
+			echo "	<input name='fax_files[]' id='fax_files_".$f."' type='file' class='formfld fileinput' style='margin-right: 3px; ".(($f > 1) ? "margin-top: 3px;" : null)."' onchange=\"".(($f < $upload_file_range_limit) ? "document.getElementById('fax_file_".($f+1)."').style.display='';" : null)." list_selected_files(".$f.");\" multiple='multiple'>";
 			echo button::create(['type'=>'button','label'=>$text['button-clear'],'icon'=>$settings->get('theme','button_icon_reset'),'onclick'=>"reset_file_input('fax_files_".$f."'); document.getElementById('file_list_".$f."').innerHTML='';"]);
 			echo 	"<br />";
 			echo "	<span id='file_list_".$f."'></span>";