diff --git a/XenAdmin/Help/HelpManager.resx b/XenAdmin/Help/HelpManager.resx
index 3148d4078..f2a0f43a5 100644
--- a/XenAdmin/Help/HelpManager.resx
+++ b/XenAdmin/Help/HelpManager.resx
@@ -657,6 +657,24 @@
   <data name="NewPolicyWizard_VirtualMachinesPane" xml:space="preserve">
     <value>6535</value>
   </data>
+  <data name="NewPolicyWizardVMSS_EmailalertsPane" xml:space="preserve">
+    <value>6551</value>
+  </data>
+  <data name="NewPolicyWizardVMSS_FinishPane" xml:space="preserve">
+    <value>6551</value>
+  </data>
+  <data name="NewPolicyWizardVMSS_PolicyNamePane" xml:space="preserve">
+    <value>6551</value>
+  </data>
+  <data name="NewPolicyWizardVMSS_SnapshotfrequencyPane" xml:space="preserve">
+    <value>6551</value>
+  </data>
+  <data name="NewPolicyWizardVMSS_SnapshottypePane" xml:space="preserve">
+    <value>6551</value>
+  </data>
+  <data name="NewPolicyWizardVMSS_VMsPane" xml:space="preserve">
+    <value>6551</value>
+  </data>
   <data name="NewPoolDialog" xml:space="preserve">
     <value>5100</value>
   </data>
diff --git a/XenAdmin/Wizards/NewPolicyWizard/NewPolicyWizardSpecific.cs b/XenAdmin/Wizards/NewPolicyWizard/NewPolicyWizardSpecific.cs
index d2986ca67..47293af0a 100644
--- a/XenAdmin/Wizards/NewPolicyWizard/NewPolicyWizardSpecific.cs
+++ b/XenAdmin/Wizards/NewPolicyWizard/NewPolicyWizardSpecific.cs
@@ -261,8 +261,18 @@ namespace XenAdmin.Wizards.NewPolicyWizard
 
         protected override string WizardPaneHelpID()
         {
-            return CurrentStepTabPage is RBACWarningPage ? FormatHelpId("Rbac") : base.WizardPaneHelpID();
+            if (CurrentStepTabPage is RBACWarningPage)
+            {
+                return FormatHelpId("Rbac");
+            }
+
+            else if (!VMGroup<T>.isVMPolicyVMPP)
+            {
+                return "NewPolicyWizardVMSS_" + CurrentStepTabPage.HelpID + "Pane";    
+            }
+
+            return "NewPolicyWizard_" + CurrentStepTabPage.HelpID + "Pane";
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/XenAdminTests/WizardTests/NewPolicyWizardTest.cs b/XenAdminTests/WizardTests/NewPolicyWizardTest.cs
index 081a81520..f940189dc 100644
--- a/XenAdminTests/WizardTests/NewPolicyWizardTest.cs
+++ b/XenAdminTests/WizardTests/NewPolicyWizardTest.cs
@@ -38,16 +38,16 @@ namespace XenAdminTests.WizardTests.cowleyPolicies_xml
 {
 
     [TestFixture, Category(TestCategories.UICategoryB)]
-    class NewPolicyWizardTest : WizardTest<NewPolicyWizard>
+    class NewPolicyWizardTest : WizardTest<NewPolicyWizardSpecific<XenAPI.VMPP>>
     {
-        public NewPolicyWizardTest()
-            : base(new string[] { "Policy Name", "Protected VMs", "Snapshot Type", "Snapshot Schedule","Archive Options","Email Alerts","Finish" }
+        public NewPolicyWizardSpecific()
+            : base(new string[] { "Policy Name", "Protected VMs", "Snapshot Type", "Snapshot schedule","Archive Options","Email Alerts","Finish" }
             , true, false)
         { }
 
-        protected override NewPolicyWizard NewWizard()
+        protected override NewPolicyWizardSpecific<XenAPI.VMPP> NewWizard()
         {
-            return new NewPolicyWizard(base.GetAnyPool());
+            return new NewPolicyWizardSpecific<XenAPI.VMPP>(base.GetAnyPool());
         }
 
         protected override void TestPage(string pageName)