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 b5898e277..62c94aaa8 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
@@ -207,17 +207,20 @@ public void modifyAccount(ProtocolProviderService protocolProvider) {
             String accountRootPropName = (String) accountsIter.next();
 
             String accountUID = configService.getString(accountRootPropName);
-            
+
             if(accountUID.equals(protocolProvider
                     .getAccountID().getAccountUniqueID())) {
-                
+                                
                 wizardClassName = configService.getString(
-                        accountRootPropName + ".WIZARD");
+                        accountRootPropName + ".wizard");
+                break;
             }
         }
+        
+        System.out.println("WIZARD CLASSS NAME::::::::" + wizardClassName);
         AccountRegistrationWizard wizard
             = getWizardFromClassName(wizardClassName);
-        
+        System.out.println("WIZARD::::::::" + wizard);
         this.registerWizardPage(summaryPage.getIdentifier(), summaryPage);
         
         this.setCurrentWizard(wizard);
@@ -285,7 +288,7 @@ public void addAccountWizard(
 
                 configService.setProperty(
                         accountRootPropName + ".wizard",
-                        wizard);
+                        wizard.getClass().getName().replace('.', '_'));
 
                 savedAccount = true;
             }