diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.Designer.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.Designer.cs
index 854427732aa..4bf424fa4b9 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.Designer.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.Designer.cs
@@ -45,7 +45,7 @@ namespace CloudStack.Plugin.AgentShell
         private void InitializeComponent()
         {
             components = new System.ComponentModel.Container();
-            this.ServiceName = "CloudStack ServerResource";
+            this.ServiceName = Program.serviceName;
         }
 
         #endregion
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config
index 68ab80ee555..b783dfecd63 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config
@@ -10,9 +10,9 @@
     </sectionGroup>
   </configSections>
 
-  <startup> 
+  <startup>
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
+  </startup>
 
   <log4net>
     <appender name="FileAppender" type="log4net.Appender.FileAppender">
@@ -25,13 +25,14 @@
     </appender>
     <appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
       <appendToFile value="true" />
+      <param name="ApplicationName" value="CloudStack Hyper-V Agent" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline"/>
       </layout>
     </appender>
     <root>
       <level value="ALL"/>
-      <appender-ref ref="FileAppender"/>
+      <appender-ref ref="EventLogAppender"/>
     </root>
   </log4net>