diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
index cd333c8cf..29b14e669 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
@@ -279,4 +279,22 @@ public Dimension getSize()
     {
         return new Dimension(600, 500);
     }
+
+    /**
+     * Returns the identifier of the page to show first in the wizard.
+     * @return the identifier of the page to show first in the wizard.
+     */
+    public Object getFirstPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
+    /**
+     * Returns the identifier of the page to show last in the wizard.
+     * @return the identifier of the page to show last in the wizard.
+     */
+    public Object getLastPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
 }
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
index d33dfc128..53e3f9e92 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
@@ -254,4 +254,23 @@ public Dimension getSize()
     {
         return new Dimension(600, 500);
     }
+    
+    /**
+     * Returns the identifier of the page to show first in the wizard.
+     * @return the identifier of the page to show first in the wizard.
+     */
+    public Object getFirstPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
+    /**
+     * Returns the identifier of the page to show last in the wizard.
+     * @return the identifier of the page to show last in the wizard.
+     */
+    public Object getLastPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
 }
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
index c10f5f1ac..b89101a3d 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
@@ -288,4 +288,23 @@ public Dimension getSize()
     {
         return new Dimension(600, 500);
     }
+    
+    /**
+     * Returns the identifier of the page to show first in the wizard.
+     * @return the identifier of the page to show first in the wizard.
+     */
+    public Object getFirstPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
+    /**
+     * Returns the identifier of the page to show last in the wizard.
+     * @return the identifier of the page to show last in the wizard.
+     */
+    public Object getLastPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
 }
diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
index ed1d0865c..6cfbeefd4 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
@@ -281,4 +281,22 @@ public Dimension getSize()
     {
         return new Dimension(600, 500);
     }
+    
+    /**
+     * Returns the identifier of the page to show first in the wizard.
+     * @return the identifier of the page to show first in the wizard.
+     */
+    public Object getFirstPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
+    /**
+     * Returns the identifier of the page to show last in the wizard.
+     * @return the identifier of the page to show last in the wizard.
+     */
+    public Object getLastPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
 }
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
index d35065b4f..647c2f4fb 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
@@ -279,4 +279,23 @@ public Dimension getSize()
     {
         return new Dimension(300, 480);
     }
+    
+    /**
+     * Returns the identifier of the page to show first in the wizard.
+     * @return the identifier of the page to show first in the wizard.
+     */
+    public Object getFirstPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
+    /**
+     * Returns the identifier of the page to show last in the wizard.
+     * @return the identifier of the page to show last in the wizard.
+     */
+    public Object getLastPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
 }
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
index 81a8026c9..56db0ff75 100644
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
@@ -256,4 +256,23 @@ public Dimension getSize()
     {
         return new Dimension(600, 500);
     }
+    
+    /**
+     * Returns the identifier of the page to show first in the wizard.
+     * @return the identifier of the page to show first in the wizard.
+     */
+    public Object getFirstPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
+    /**
+     * Returns the identifier of the page to show last in the wizard.
+     * @return the identifier of the page to show last in the wizard.
+     */
+    public Object getLastPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
 }
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
index adaed24d2..929e74e39 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
@@ -205,4 +205,23 @@ public Dimension getSize()
     {
         return new Dimension(600, 500);
     }
+    
+    /**
+     * Returns the identifier of the page to show first in the wizard.
+     * @return the identifier of the page to show first in the wizard.
+     */
+    public Object getFirstPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
+    /**
+     * Returns the identifier of the page to show last in the wizard.
+     * @return the identifier of the page to show last in the wizard.
+     */
+    public Object getLastPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
 }
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
index 538cc4edb..9e7f8d3de 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
@@ -16,7 +16,7 @@
 import org.osgi.framework.*;
 
 /**
- * The <tt>SIPAccountRegistrationWizard</tt> is an implementation of the
+ * The <tt>IPPIAccountRegistrationWizard</tt> is an implementation of the
  * <tt>AccountRegistrationWizard</tt> for the SIP protocol. It should allow
  * the user to create and configure a new SIP account.
  *
@@ -43,7 +43,7 @@ public class SIPAccountRegistrationWizard
         = Logger.getLogger(SIPAccountRegistrationWizard.class);
 
     /**
-     * Creates an instance of <tt>SIPAccountRegistrationWizard</tt>.
+     * Creates an instance of <tt>IPPIAccountRegistrationWizard</tt>.
      * @param wizardContainer the wizard container, where this wizard
      * is added
      */
@@ -316,4 +316,23 @@ public Dimension getSize()
     {
         return new Dimension(600, 500);
     }
+    
+    /**
+     * Returns the identifier of the page to show first in the wizard.
+     * @return the identifier of the page to show first in the wizard.
+     */
+    public Object getFirstPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
+    /**
+     * Returns the identifier of the page to show last in the wizard.
+     * @return the identifier of the page to show last in the wizard.
+     */
+    public Object getLastPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
 }
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
index aab1eca95..2111d506e 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
@@ -275,4 +275,23 @@ public Dimension getSize()
     {
         return new Dimension(600, 500);
     }
+    
+    /**
+     * Returns the identifier of the page to show first in the wizard.
+     * @return the identifier of the page to show first in the wizard.
+     */
+    public Object getFirstPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
+    /**
+     * Returns the identifier of the page to show last in the wizard.
+     * @return the identifier of the page to show last in the wizard.
+     */
+    public Object getLastPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
 }
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
index 34b7259d7..68641104b 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
@@ -257,4 +257,23 @@ public Dimension getSize()
     {
         return new Dimension(600, 500);
     }
+    
+    /**
+     * Returns the identifier of the page to show first in the wizard.
+     * @return the identifier of the page to show first in the wizard.
+     */
+    public Object getFirstPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
+    /**
+     * Returns the identifier of the page to show last in the wizard.
+     * @return the identifier of the page to show last in the wizard.
+     */
+    public Object getLastPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
 }
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
index d7dbb0ffa..060b5ae2f 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
@@ -261,4 +261,23 @@ public Dimension getSize()
     {
         return new Dimension(600, 500);
     }
+    
+    /**
+     * Returns the identifier of the page to show first in the wizard.
+     * @return the identifier of the page to show first in the wizard.
+     */
+    public Object getFirstPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
+    /**
+     * Returns the identifier of the page to show last in the wizard.
+     * @return the identifier of the page to show last in the wizard.
+     */
+    public Object getLastPageIdentifier()
+    {
+        return firstWizardPage.getIdentifier();
+    }
+
 }
diff --git a/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java b/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java
index 4f9dbc397..8c39e60c7 100644
--- a/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java
@@ -20,7 +20,7 @@
  * <p>
  * Note that the <tt>AccountRegistrationWizard</tt> is NOT a real wizard, it
  * doesn't handle wizard events. Each UI Service implementation should provide
- * its own wizard ui control, which should manage all the events, panels and
+ * its own wizard UI control, which should manage all the events, panels and
  * buttons, etc.
  * <p>
  * It depends on the wizard implementation in the UI for whether or not a
@@ -79,7 +79,25 @@ public interface AccountRegistrationWizard {
      * wizard. 
      */
     public Iterator getPages();
-    
+
+    /**
+     * Returns the identifier of the first account registration wizard page.
+     * This method is meant to be used by the wizard container to determine,
+     * which is the first page to show to the user.
+     * 
+     * @return the identifier of the first account registration wizard page
+     */
+    public Object getFirstPageIdentifier();
+
+    /**
+     * Returns the identifier of the last account registration wizard page. This
+     * method is meant to be used by the wizard container to determine which is
+     * the page to show before the summary page (of course if there's a summary).
+     * 
+     * @return the identifier of the last account registration wizard page
+     */
+    public Object getLastPageIdentifier();
+
     /**
      * Returns a set of key-value pairs that will represent the summary for
      * this wizard.