diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java
index 2f4260561..6a75d9c08 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java
@@ -195,16 +195,16 @@ public void modifyAccount(ProtocolProviderService protocolProvider) {
         
         String wizardClassName = null;
         
-        String prefix = "net.java.sip.communicator.impl.ui";
-        
+        String prefix = "net.java.sip.communicator.impl.ui.accounts";
+                        
         List accounts = this.configService
                 .getPropertyNamesByPrefix(prefix, true);
         
         Iterator accountsIter = accounts.iterator();
         
-        while(accountsIter.hasNext()) {
+        while(accountsIter.hasNext()) {            
             String accountRootPropName = (String) accountsIter.next();
-            
+
             String accountUID = configService.getString(accountRootPropName);
             
             if(accountUID.equals(protocolProvider
@@ -270,7 +270,7 @@ public void addAccountWizard(
         String wizardClassName = wizard.getClass()
             .getName().replace('.', '_');
         
-        String accountPackage = "net.java.sip.communicator.impl.ui."
+        String accountPackage = "net.java.sip.communicator.impl.ui.accounts."
                                 + accNodeName;
         
         configService.setProperty(accountPackage,