diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
index a2a33ffaa..a4fa5bae8 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
@@ -220,15 +220,17 @@ public void pageBack() {
      * @param protocolProvider The <tt>ProtocolProviderService</tt> to load the
      * data from.
      */
-    public void loadAccount(ProtocolProviderService protocolProvider, 
-            boolean rememberPassword) {
+    public void loadAccount(ProtocolProviderService protocolProvider) {
         AccountID accountID = protocolProvider.getAccountID();
         String password = (String)accountID.getAccountProperties()
             .get(ProtocolProviderFactory.PASSWORD);
         
         this.uinField.setText(accountID.getUserID());
-        this.passField.setText(password);
         
-        this.rememberPassBox.setSelected(rememberPassword);
+        if(password != null) {
+            this.passField.setText(password);
+        
+            this.rememberPassBox.setSelected(true);
+        }
     }
 }
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccRegWizzActivator.java
index dd980b78e..e74e1b030 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccRegWizzActivator.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccRegWizzActivator.java
@@ -73,20 +73,4 @@ public static ProtocolProviderFactory getIcqProtocolProviderFactory() {
 
         return (ProtocolProviderFactory) bundleContext.getService(serRefs[0]);
     }
-    
-    /**
-     * Returns the <tt>ConfigurationService</tt>.
-     * @return the <tt>ConfigurationService</tt>
-     */
-    public static ConfigurationService getConfigurationService() {
-        if(configService == null) {
-            ServiceReference configReference = bundleContext
-                .getServiceReference(ConfigurationService.class.getName());
-
-            configService = (ConfigurationService) bundleContext
-                .getService(configReference);
-        }
-
-        return configService;
-    }
 }
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
index 7a24cc6f1..a41a1faae 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
@@ -8,11 +8,11 @@
 
 import java.util.*;
 
-import org.osgi.framework.*;
-import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * The <tt>IcqAccountRegistrationWizard</tt> is an implementation of the
  * <tt>AccountRegistrationWizard</tt> for the ICQ protocol. It should allow
@@ -29,13 +29,8 @@ public class IcqAccountRegistrationWizard implements AccountRegistrationWizard {
 
     private WizardContainer wizardContainer;
     
-    ConfigurationService configService 
-        = IcqAccRegWizzActivator.getConfigurationService();
-    
     private ProtocolProviderService protocolProvider;
     
-    private String propertiesPackage = "net.java.sip.communicator.plugin.icqaccregwizz";
-    
     /**
      * Creates an instance of <tt>IcqAccountRegistrationWizard</tt>.
      * @param wizardContainer the wizard container, where this wizard
@@ -132,12 +127,7 @@ public ProtocolProviderService installAccount(
         
         AccountID accountID = providerFactory.installAccount(
                     user, accountProperties);
-        
-        configService.setProperty(
-                propertiesPackage + ".REMEMBER_PASSWORD",
-                new Boolean(registration.isRememberPassword())
-                );
-        
+                
         ServiceReference serRef = providerFactory
             .getProviderForAccount(accountID);
 
@@ -158,12 +148,6 @@ public void loadAccount(ProtocolProviderService protocolProvider) {
         
         this.protocolProvider = protocolProvider;
         
-        boolean rememberPassword 
-            = new Boolean(configService
-                    .getString(propertiesPackage + ".REMEMBER_PASSWORD"))
-                        .booleanValue();
-        
-        this.firstWizardPage.loadAccount(
-                protocolProvider, rememberPassword);
+        this.firstWizardPage.loadAccount(protocolProvider);
     }
 }
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java
index f3cc4eb1d..4cad46b00 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java
@@ -265,16 +265,17 @@ public void pageBack() {
      * @param protocolProvider The <tt>ProtocolProviderService</tt> to load the
      * data from.
      */
-    public void loadAccount(ProtocolProviderService protocolProvider,
-            boolean rememberPassword) {
+    public void loadAccount(ProtocolProviderService protocolProvider) {
         AccountID accountID = protocolProvider.getAccountID();
         String password = (String)accountID.getAccountProperties()
             .get(ProtocolProviderFactory.PASSWORD);
-
+        
         this.uinField.setText(accountID.getUserID());
-        this.passField.setText(password);
 
-        this.rememberPassBox.setSelected(rememberPassword);
+        if(password != null) {
+            this.passField.setText(password);
+            this.rememberPassBox.setSelected(true);
+        }
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java
index aec4bb6b8..e217a61ca 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java
@@ -75,20 +75,4 @@ public static ProtocolProviderFactory getJabberProtocolProviderFactory() {
 
         return (ProtocolProviderFactory) bundleContext.getService(serRefs[0]);
     }
-
-    /**
-     * Returns the <tt>ConfigurationService</tt>.
-     * @return the <tt>ConfigurationService</tt>
-     */
-    public static ConfigurationService getConfigurationService() {
-        if(configService == null) {
-            ServiceReference configReference = bundleContext
-                .getServiceReference(ConfigurationService.class.getName());
-
-            configService = (ConfigurationService) bundleContext
-                .getService(configReference);
-        }
-
-        return configService;
-    }
 }
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
index 6ae94d447..8423958ef 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
@@ -29,9 +29,6 @@ public class JabberAccountRegistrationWizard implements AccountRegistrationWizar
 
     private WizardContainer wizardContainer;
 
-    ConfigurationService configService
-        = JabberAccRegWizzActivator.getConfigurationService();
-
     private ProtocolProviderService protocolProvider;
 
     private String propertiesPackage = "net.java.sip.communicator.plugin.jabberaccregwizz";
@@ -145,11 +142,6 @@ public ProtocolProviderService installAccount(
         AccountID accountID = providerFactory.installAccount(
                     user, accountProperties);
 
-        configService.setProperty(
-                propertiesPackage + ".REMEMBER_PASSWORD",
-                new Boolean(registration.isRememberPassword())
-                );
-
         ServiceReference serRef = providerFactory
             .getProviderForAccount(accountID);
 
@@ -170,12 +162,6 @@ public void loadAccount(ProtocolProviderService protocolProvider) {
 
         this.protocolProvider = protocolProvider;
 
-        boolean rememberPassword
-            = new Boolean(configService
-                    .getString(propertiesPackage + ".REMEMBER_PASSWORD"))
-                        .booleanValue();
-
-        this.firstWizardPage.loadAccount(
-                protocolProvider, rememberPassword);
+        this.firstWizardPage.loadAccount(protocolProvider);
     }
 }