diff --git a/data/glade/account_creation_wizard_window.glade b/data/glade/account_creation_wizard_window.glade
index cacb4f9e6..8ec190ed6 100644
--- a/data/glade/account_creation_wizard_window.glade
+++ b/data/glade/account_creation_wizard_window.glade
@@ -129,43 +129,10 @@ to the Jabber network.
True
- 4
- 3
+ 2
+ 4
12
6
-
-
-
-
-
-
-
-
- True
- True
-
-
-
-
- 1
- 2
-
-
-
-
-
- True
- 0
- _Server:
- True
-
-
- 1
- 2
- GTK_FILL
-
-
-
True
@@ -176,29 +143,52 @@ to the Jabber network.
- 1
- 2
- 1
- 2
+ 3
+ 4
GTK_FILL
GTK_FILL
-
+
True
0
- _Password:
- True
- password_entry
+ @
+
+
+ 2
+ 3
+
+
+
+
+
+ True
+ 0
+ _Jabber ID:
+ True
+ username_entry
- 2
- 3
GTK_FILL
+
+
+ True
+ True
+ False
+ True
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
True
@@ -214,73 +204,44 @@ to the Jabber network.
2
- 3
- 2
- 3
+ 4
+ 1
+ 2
GTK_FILL
-
+
+ True
+ 0
+ _Password:
+ True
+ password_entry
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
True
True
- False
- True
+
+
1
2
- 2
- 3
-
-
-
-
-
- True
- 0
- _Username:
- True
- username_entry
-
-
- GTK_FILL
-
-
-
-
-
- True
- 0
- Your JID:
-
-
- 3
- 4
- GTK_FILL
-
-
-
-
-
- True
- True
- 0
- True
- True
-
-
- 1
- 3
- 3
- 4
- GTK_FILL
+ False
1
@@ -363,62 +324,6 @@ to the Jabber network.
3
5
5
-
-
- True
- 0
- Prox_y:
- True
-
-
- GTK_FILL
-
-
-
-
-
- True
- None
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- True
- Manage...
- True
- 0
-
-
-
- 2
- 3
-
-
-
-
-
-
- True
- True
- Use custom hostname/port
- True
- 0
- True
-
-
-
- 3
- 1
- 2
-
-
-
True
@@ -481,6 +386,62 @@ to the Jabber network.
GTK_FILL
+
+
+ True
+ True
+ Use custom hostname/port
+ True
+ 0
+ True
+
+
+
+ 3
+ 1
+ 2
+
+
+
+
+
+ True
+ True
+ Manage...
+ True
+ 0
+
+
+
+ 2
+ 3
+
+
+
+
+
+
+ True
+ None
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ 0
+ Prox_y:
+ True
+
+
+ GTK_FILL
+
+
+