diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs
index c16776e0..933b28f8 100644
--- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs	
+++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs	
@@ -424,11 +424,14 @@ namespace VEPROMS
 				RevDate = DateTime.Today.ToShortDateString();
 				ReviewDate = null;
 			}
-			cbxWaterMark.DataSource = EnumDetail<PrintWatermark>.Details();
-			cbxWaterMark.DisplayMember = "Description";
+			// B2019-044 use Enum without the "None" option for the print dialog
+			cbxWaterMark.DataSource = EnumDetail<PrintDlgWatermarkList>.Details();
 			cbxWaterMark.ValueMember = "EValue";
 			PrintWatermark pw = _DocVersionConfig.Print_Watermark; // MyProcedure.ProcedureConfig.Print_Watermark;
-			cbxWaterMark.Text = pw.ToString();
+			if (!pw.ToString().ToUpper().Equals("NONE")) //B2019-044 check setting from folder level
+				cbxWaterMark.Text = pw.ToString(); // position print dialog list to setting from folder level
+			else
+				swtbtnWaterMark.Value = false; // set to None at folder level so set Watermark switch to the off position
 
 			//ppCmbxChgBarPos.DataSource = EnumDetail<PrintChangeBarLoc>.Details();
 			//ppCmbxChgBarPos.DisplayMember = "Description";
@@ -818,7 +821,8 @@ namespace VEPROMS
 			// If file exists, determine if overwrite checkbox allows overwrite, if not prompt.
 
 			Volian.Print.Library.Rtf2Pdf.PdfDebug = cbxDebug.Checked;
-			string waterMarkText = cbxWaterMark.Text; // B2018-124 use text of watermark form drop down list instead of enum value
+			// B2019-044 don't print the watermark if the watermark switch on the print dialog is turned off
+			string waterMarkText = (swtbtnWaterMark.Value) ? cbxWaterMark.Text : "None" ; // B2018-124 use text of watermark form drop down list instead of enum value
 			// Determine change bar settings.  First get from config & then see if override from dialog. 
 			// Also check that format allows override.
 			ChangeBarDefinition cbd = DetermineChangeBarSettings();
diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ConfigEnum.cs b/PROMS/VEPROMS.CSLA.Library/Config/ConfigEnum.cs
index dd6bcb3e..fdf1a602 100644
--- a/PROMS/VEPROMS.CSLA.Library/Config/ConfigEnum.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Config/ConfigEnum.cs
@@ -15,6 +15,14 @@ namespace VEPROMS.CSLA.Library
 			[Description("Information Only")]
 			InformationOnly
 		}
+		// B2019-044 use Enum without the "None" option for the print dialog
+		[TypeConverter(typeof(EnumDescConverter))]
+		public enum PrintDlgWatermarkList : int
+		{
+			Reference, Draft, Master, Sample,
+			[Description("Information Only")]
+			InformationOnly
+		}
 		// Change Bar Use from 16-bit code:
 		//  	No Default
 		//      Without Change Bars