diff --git a/XenAdmin/Help/HelpManager.resx b/XenAdmin/Help/HelpManager.resx
index 761035568..12b820c9b 100644
--- a/XenAdmin/Help/HelpManager.resx
+++ b/XenAdmin/Help/HelpManager.resx
@@ -175,7 +175,7 @@
     <value>troubleshooting-bugtool</value>
   </data>
   <data name="CertificateAlert" xml:space="preserve">
-    <value></value>
+    <value>hosts-certificates</value>
   </data>
   <data name="CertificateChangedDialog" xml:space="preserve">
     <value>hosts-reconnect</value>
@@ -586,7 +586,7 @@
     <value>vms-importdiskimage</value>
   </data>
   <data name="InstallCertificate" xml:space="preserve">
-    <value></value>
+    <value>hosts-certificates</value>
   </data>
   <data name="InstallToolsWarningDialog" xml:space="preserve">
     <value>vms-installtools</value>
diff --git a/XenModel/Actions/Host/InstallCertificateAction.cs b/XenModel/Actions/Host/InstallCertificateAction.cs
index cbaa35f9c..ef48ba089 100644
--- a/XenModel/Actions/Host/InstallCertificateAction.cs
+++ b/XenModel/Actions/Host/InstallCertificateAction.cs
@@ -61,7 +61,6 @@ namespace XenAdmin.Actions
                 Messages.INSTALL_SERVER_CERTIFICATE_DESCRIPTION, true)
         {
             Host = host;
-            _session = Session;
             _hostRef = host.opaque_ref;
             _isMaster = host.IsMaster();
 
@@ -214,7 +213,8 @@ namespace XenAdmin.Actions
 
                 try
                 {
-                    Host.install_server_certificate(Session, _hostRef, certificate, privateKey, chain);
+                    _session = Session;
+                    Host.install_server_certificate(_session, _hostRef, certificate, privateKey, chain);
                     PercentComplete = 50;
                     WaitForNewCertificate();
                 }