diff --git a/SendNSWMessageService/NSWSendService.cs b/SendNSWMessageService/NSWSendService.cs
index 11cfaeb3..0dc3755e 100644
--- a/SendNSWMessageService/NSWSendService.cs
+++ b/SendNSWMessageService/NSWSendService.cs
@@ -182,7 +182,8 @@ namespace SendNSWMessageService
                             switch (message.HIS)
                             {
 
-                                case Message.NSWProvider.DBH:                                
+                                case Message.NSWProvider.DBH:
+                                case Message.NSWProvider.DBH_MAERSK:
                                     sendSucceeded = bsmd.dbh.MessageController.SendMessage(core, message);
                                     if (!sendSucceeded)
                                         message.InternalStatus = Message.BSMDStatus.SEND_FAILED;
@@ -245,6 +246,7 @@ namespace SendNSWMessageService
                                     didSendSomething = true;
                                     break;                                
                                 case Message.NSWProvider.DBH:
+                                case Message.NSWProvider.DBH_MAERSK:
                                     coreSendSucceeded = bsmd.dbh.MessageController.SendCancelCore(core);
                                     break;                                
                                 default:
diff --git a/bsmd.dbh/Properties/Settings.Designer.cs b/bsmd.dbh/Properties/Settings.Designer.cs
index ff974b23..d448198b 100644
--- a/bsmd.dbh/Properties/Settings.Designer.cs
+++ b/bsmd.dbh/Properties/Settings.Designer.cs
@@ -103,5 +103,14 @@ namespace bsmd.dbh.Properties {
                 return ((string)(this["IncomingErrorFolder"]));
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("00006017")]
+        public string SenderMaersk {
+            get {
+                return ((string)(this["SenderMaersk"]));
+            }
+        }
     }
 }
diff --git a/bsmd.dbh/Properties/Settings.settings b/bsmd.dbh/Properties/Settings.settings
index c1debefc..4db2b6c2 100644
--- a/bsmd.dbh/Properties/Settings.settings
+++ b/bsmd.dbh/Properties/Settings.settings
@@ -29,5 +29,8 @@
     <Setting Name="IncomingErrorFolder" Type="System.String" Scope="Application">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="SenderMaersk" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">00006017</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/bsmd.dbh/RequestUtil.cs b/bsmd.dbh/RequestUtil.cs
index 62ab8232..01511c75 100644
--- a/bsmd.dbh/RequestUtil.cs
+++ b/bsmd.dbh/RequestUtil.cs
@@ -28,7 +28,14 @@ namespace bsmd.dbh
                 root.Version = RootVersion.Item71;
                 root.SourceDocumentVersion = "7.1";
                 root.Timestamp = DateTime.Now;
-                root.Sender = Properties.Settings.Default.Sender;
+                if(core.InitialHIS == Message.NSWProvider.DBH_MAERSK)
+                {
+                    root.Sender = Properties.Settings.Default.SenderMaersk;
+                }
+                else
+                {
+                    root.Sender = Properties.Settings.Default.Sender;
+                }
                 root.SenderReference = message.Id.Value.ToString("N");
 
                 bsmd.database.ReportingParty reportingParty = DBManager.Instance.GetReportingPartyDict()[core.DefaultReportingPartyId.Value];
diff --git a/bsmd.dbh/app.config b/bsmd.dbh/app.config
index 27cebe9c..b9d62b74 100644
--- a/bsmd.dbh/app.config
+++ b/bsmd.dbh/app.config
@@ -34,6 +34,9 @@
             <setting name="IncomingErrorFolder" serializeAs="String">
                 <value />
             </setting>
+            <setting name="SenderMaersk" serializeAs="String">
+                <value>00006017</value>
+            </setting>
         </bsmd.dbh.Properties.Settings>
     </applicationSettings>
 </configuration>