diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java
index 023568c..14e0415 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.equinox.internal.security.ui.storage;
 
-import org.eclipse.equinox.internal.security.ui.Activator;
 import org.eclipse.equinox.internal.security.ui.nls.SecUIMessages;
 import org.eclipse.jface.dialogs.*;
 import org.eclipse.jface.layout.GridLayoutFactory;
@@ -25,7 +24,7 @@
 
 public class ChallengeResponseDialog extends TitleAreaDialog {
 
-	private static final String HELP_ID = Activator.PLUGIN_ID + ".ChallengeResponseDialog"; //$NON-NLS-1$
+	private static final String HELP_ID = "org.eclipse.equinox.security.ui.challenge_response_dialog"; //$NON-NLS-1$
 
 	protected Text[] questions;
 	protected Text[] answers;
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/PasswordRecoveryDialog.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/PasswordRecoveryDialog.java
index 91c98ca..64d4676 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/PasswordRecoveryDialog.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/PasswordRecoveryDialog.java
@@ -11,7 +11,6 @@
 package org.eclipse.equinox.internal.security.ui.storage;
 
 import org.eclipse.equinox.internal.security.storage.friends.InternalExchangeUtils;
-import org.eclipse.equinox.internal.security.ui.Activator;
 import org.eclipse.equinox.internal.security.ui.nls.SecUIMessages;
 import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
 import org.eclipse.jface.dialogs.*;
@@ -27,7 +26,7 @@
 
 public class PasswordRecoveryDialog extends TitleAreaDialog {
 
-	private static final String HELP_ID = Activator.PLUGIN_ID + ".PasswordRecoveryDialog"; //$NON-NLS-1$
+	private static final String HELP_ID = "org.eclipse.equinox.security.ui.password_recovery_dialog"; //$NON-NLS-1$
 
 	protected Text[] answers;
 	protected String moduleID;
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StoragePreferencePage.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StoragePreferencePage.java
index da1aa63..8168ec7 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StoragePreferencePage.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StoragePreferencePage.java
@@ -17,11 +17,12 @@
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.*;
 
 public class StoragePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
 
+	private static final String HELP_ID = "org.eclipse.equinox.security.ui.sec_storage_preferences_context"; //$NON-NLS-1$
+
 	protected TabPassword passwordTab;
 	protected TabContents contentsTab;
 	protected TabAdvanced advancedTab;
@@ -60,6 +61,7 @@
 			}
 		});
 		Dialog.applyDialogFont(folder);
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), HELP_ID);
 		return folder;
 	}