From 8a5aed7f3968be95c6d5259e9c11359084245f2e Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Mon, 12 Jul 2010 12:19:31 +0000
Subject: [PATCH] Create SIP2SIP info account.

Enhanced SIP account registration form.
---
 build.xml                                     |  13 +-
 lib/felix.client.run.properties               |   5 +-
 resources/images/images.properties            |   4 +
 .../images/protocol/sip2sip/sip16x16-away.png | Bin 0 -> 935 bytes
 .../images/protocol/sip2sip/sip16x16-busy.png | Bin 0 -> 913 bytes
 .../protocol/sip2sip/sip16x16-offline.png     | Bin 0 -> 612 bytes
 .../protocol/sip2sip/sip16x16-online.png      | Bin 0 -> 905 bytes
 .../protocol/sip2sip/sip16x16-phone.png       | Bin 0 -> 956 bytes
 .../images/protocol/sip2sip/sip16x16.png      | Bin 0 -> 882 bytes
 .../images/protocol/sip2sip/sip32x32.png      | Bin 0 -> 2494 bytes
 .../images/protocol/sip2sip/sip48x48.png      | Bin 0 -> 4545 bytes
 .../images/protocol/sip2sip/sip64x64.png      | Bin 0 -> 6662 bytes
 resources/languages/resources.properties      |   8 +
 .../gui/customcontrols/wizard/Wizard.java     |   1 -
 .../iptelaccregwizz/FirstWizardPage.java      | 735 ------------------
 .../IptelAccRegWizzActivator.java             |  30 +-
 .../IptelAccountRegistration.java             | 433 -----------
 .../IptelAccountRegistrationWizard.java       | 512 ++----------
 .../plugin/iptelaccregwizz/Resources.java     |  88 ---
 .../iptelaccregwizz.manifest.mf               |   3 +-
 .../Sip2SipAccRegWizzActivator.java           | 136 ++++
 .../Sip2SipAccountRegistrationWizard.java     | 150 ++++
 .../sip2sipaccregwizz.manifest.mf             |  42 +
 .../plugin/sipaccregwizz/AccountPanel.java    | 271 +++++++
 .../plugin/sipaccregwizz/ConnectionPanel.java | 453 +++++++++++
 .../plugin/sipaccregwizz/FirstWizardPage.java | 584 +-------------
 .../plugin/sipaccregwizz/PresencePanel.java   | 181 +++++
 .../SIPAccountRegistrationForm.java           | 331 ++++++++
 .../SIPAccountRegistrationWizard.java         |  83 +-
 .../sipaccregwizz/sipaccregwizz.manifest.mf   |   1 +
 30 files changed, 1738 insertions(+), 2326 deletions(-)
 create mode 100644 resources/images/protocol/sip2sip/sip16x16-away.png
 create mode 100644 resources/images/protocol/sip2sip/sip16x16-busy.png
 create mode 100644 resources/images/protocol/sip2sip/sip16x16-offline.png
 create mode 100644 resources/images/protocol/sip2sip/sip16x16-online.png
 create mode 100644 resources/images/protocol/sip2sip/sip16x16-phone.png
 create mode 100644 resources/images/protocol/sip2sip/sip16x16.png
 create mode 100644 resources/images/protocol/sip2sip/sip32x32.png
 create mode 100644 resources/images/protocol/sip2sip/sip48x48.png
 create mode 100644 resources/images/protocol/sip2sip/sip64x64.png
 delete mode 100644 src/net/java/sip/communicator/plugin/iptelaccregwizz/FirstWizardPage.java
 delete mode 100644 src/net/java/sip/communicator/plugin/iptelaccregwizz/IptelAccountRegistration.java
 delete mode 100644 src/net/java/sip/communicator/plugin/iptelaccregwizz/Resources.java
 create mode 100644 src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccRegWizzActivator.java
 create mode 100644 src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java
 create mode 100644 src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf
 create mode 100644 src/net/java/sip/communicator/plugin/sipaccregwizz/AccountPanel.java
 create mode 100644 src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java
 create mode 100644 src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java
 create mode 100644 src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java

diff --git a/build.xml b/build.xml
index e5a04c127..202a0cf97 100644
--- a/build.xml
+++ b/build.xml
@@ -912,7 +912,8 @@
         bundle-plugin-facebookaccregwizz,
         bundle-bouncycastle,bundle-plugin-otr,bundle-plugin-iptelaccregwizz,
         bundle-contactsource,bundle-plugin-reconnect,
-        bundle-plugin-securityconfig,bundle-plugin-advancedconfig"/>
+        bundle-plugin-securityconfig,bundle-plugin-advancedconfig,
+        bundle-plugin-sip2sipaccregwizz"/>
 
     <!--BUNDLE-SC-LAUNCHER-->
     <target name="bundle-sc-launcher">
@@ -1569,6 +1570,16 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
+    <!-- BUNDLE-PLUGIN-SIP2SIPACCREGWIZZ -->
+    <target name="bundle-plugin-sip2sipaccregwizz">
+        <!-- Creates a bundle for the plugin Sip2Sip Account Registration Wizard.-->
+        <jar compress="false" destfile="${bundles.dest}/sip2sipaccregwizz.jar"
+            manifest="${src}/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf">
+            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/sip2sipaccregwizz"
+                prefix="net/java/sip/communicator/plugin/sip2sipaccregwizz"/>
+        </jar>
+    </target>
+
     <!-- BUNDLE-PLUGIN-GIBBERISHACCREGWIZZ -->
     <target name="bundle-plugin-gibberishaccregwizz">
         <!-- Creates a bundle for the plugin Gibberish Account Registration
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 2f95e4e6d..93c1f3537 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -111,7 +111,6 @@ felix.auto.start.67= \
  reference:file:sc-bundles/icqaccregwizz.jar \
  reference:file:sc-bundles/aimaccregwizz.jar \
  reference:file:sc-bundles/sipaccregwizz.jar \
- reference:file:sc-bundles/iptelaccregwizz.jar \
  reference:file:sc-bundles/jabberaccregwizz.jar \
  reference:file:sc-bundles/googletalkaccregwizz.jar \
  reference:file:sc-bundles/msnaccregwizz.jar \
@@ -137,7 +136,9 @@ felix.auto.start.67= \
 
 felix.auto.start.70= \
  reference:file:sc-bundles/simpleaccreg.jar \
- reference:file:sc-bundles/securityconfig.jar
+ reference:file:sc-bundles/securityconfig.jar \
+ reference:file:sc-bundles/iptelaccregwizz.jar \
+ reference:file:sc-bundles/sip2sipaccregwizz.jar
 
 felix.auto.start.75= \
  reference:file:sc-bundles/argdelegation.jar
diff --git a/resources/images/images.properties b/resources/images/images.properties
index 876d682a4..5596fd4a5 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -359,6 +359,10 @@ service.protocol.googletalk.GTALK_64x64=resources/images/protocol/googletalk/log
 service.protocol.iptel.IPTEL_16x16=resources/images/protocol/iptel/sip16x16.png
 service.protocol.iptel.IPTEL_64x64=resources/images/protocol/iptel/sip64x64.png
 
+# sip2sip accregwizz
+service.protocol.sip2sip.SIP2SIP_16x16=resources/images/protocol/sip2sip/sip16x16.png
+service.protocol.sip2sip.SIP2SIP_64x64=resources/images/protocol/sip2sip/sip64x64.png
+
 # facebook accregwizz
 service.protocol.facebook.FACEBOOK_16x16=resources/images/protocol/facebook/facebook-online.png
 service.protocol.facebook.FACEBOOK_32x32=resources/images/protocol/facebook/facebook32.png
diff --git a/resources/images/protocol/sip2sip/sip16x16-away.png b/resources/images/protocol/sip2sip/sip16x16-away.png
new file mode 100644
index 0000000000000000000000000000000000000000..2212efdd1d54a6e6c3cdf1bb90dbb75e04a0c48b
GIT binary patch
literal 935
zcmV;Y16cftP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY=
z2?Zu6EWCCA000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}00095Nkl<Z
zILmF5YiLsk6vuz}kw<UtqDgvNT$xi_Yfxk$D|PJAxz6FJ4-~PbD1LB=!rUkmyAs{N
zPBvVHF>#^&u&E2K3JR_thHlalANWDr`ly|ix~|jM5>qs}$-PZ;lYM9#EqXqk^XL4}
zIsd~s@G?7g<3+6H@-x3Cu;QgWn!9Gkhpv?KZP&&b*q+mWvGs?G)1eH&&g0;6!oK$>
z(I2n0F>b9PmblJrSCqy-Mo}I0c$FO_(qJZ!%q(EUAlLw(g+8L>^>c_qoX7f6v{`W+
zvPseGwLDIYqgn$vY~>Vq@)||fHN(*cs6V&{ML9=-4GOdYauYgb{vJN9Xh9MBc*T(>
zVGbezvij##d$-KleE<@&@H?UacJFcfwz35R{4)Uy#rHOUm)Y5Thv*PULIIN9<iJ})
z0AvJfQo@Q|zmUs<%Y(D&?Ug3HN}*PW5f$bZNpprCj5ZKAk}RHEA)i0lnVFtn%H<>g
zJpNM@`b6>OB^>?X>NF%srJhtxVBFsH{m*sWd!v4_^TRr~;atw>yqZ<3)FPj+>t=u7
z)DmN30#D-;NEt~AMq>QiQ;ysHao8m_H`oT*zoizJsuB)|`6LjqC3StziBPEGT5oU7
z<OJfJFUe(Nxsp=%cy!=%r0jOceXyE`9NE4Bm#PBL+S*EWbv1Uo9lzf{Ka);7MF8yf
zK_Vk5?%sVwT(@}g6o&h$^oe;gfMr>E-=(T7C@rm=T4L2tT<AQ&$k>?eL0gJ=^f%c`
zUs_h%@fA=uO^QS!baZq8pePE8q7;j~vkThy23cKWq6kW6Y3+E<=UHz+;qZUM^7B{R
z)YOEgX=s{;*XzYFj1hrs7Q{&<d=dJaf!m9Cn7Ad5_NLZXy*ck#>o>*E%b2#LuG1C_
z9uyHpXgoFbJe&Q}YbAB!60Icr?#jwDhNJlFmct}<{RQ%gP^hz~yE`D{Z(`{ZtXqBg
zq{AQ|0#8g;9gVwpH<tVT%T!g>Ow)WcbpQU<p6>3zukG!b{{dB-7?u!ZGwlEX002ov
JPDHLkV1nLsw6g#J

literal 0
HcmV?d00001

diff --git a/resources/images/protocol/sip2sip/sip16x16-busy.png b/resources/images/protocol/sip2sip/sip16x16-busy.png
new file mode 100644
index 0000000000000000000000000000000000000000..257c307f619c323921f8fc83961790f3277f59cd
GIT binary patch
literal 913
zcmV;C18)3@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY=
z2>>!cft*eN000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0008)Nkl<Z
zILmdCT})GF7{`C_c~2=Vr$8HPVnwQgg}CfaF6KUz7<5J*H;W$x<Apb1><lrHY=#TP
zWqxMM%x3gPBqobSFEmEubZXqjh*1&0gCDSHXGnXHww}_{)AsD5g9XL^&GSD0H_!k1
zKhOKZR5;fEF1P>B|IaJ7*H2kT=e5cCfu0cGUHftpx9#+0HvI7Wc&Y->+6^Ve(6P9{
z{@8N_Gq(yod5iLrDD4-9(VR{A+$|(CkT!mrEHI|Sp*HyH_)=yDFQSM9u{T}#%Mv)%
zG}Ft!AeJ=IasxOWAza>x85J5kp{os=_O8P1zKF{KF8=_w^@i%&J~r3w$1NV<ab`%S
zpCJKNyYyfCQk63u01{Q4MG;Ws>n_?@Jy*b>1@n~8ns;YgJ0B7q0x4X`qBP%rGz36a
z<O(CyhmT_Cp~Oq^*B>{eA;2{MG{&N$a=M%`^m4e3#F)YS$~yJe6IZk2{-tdf1V-cQ
z2+TnF?HAP7(MG^SEE-z`;;;GZy1qZPH`q{~tF3&LmoJ__ZKy6T-cCBb$0^1g=p%x7
z!a`=HJoJyw-+duUOPBxQ5}oHy?%>nLdW6S=t?LBm1XXizaF^BFyS!y&q(K1SU6i6C
z@S2+10GbA6J}B`LzIo2xxv)YAr<1&{lZ(X)QP;`z_hTAHhXkN3w3c|nCS#gtrEY8#
zMqjbx)eYefR$yxya`tTU9uKz9hn3Be=<CA*Z($j0ceUbQGJ^l}rw;GTghLh`cES3)
z3l<npnw#xhDrLWo+f`L|kD?foPr`71_f6J>xA5}0!wxOBMe0dy#xQO#Q)QjZSX$mR
z5kg=_BAAf~@!npBy1OxR*@uFB9u%eEWb5(A4BW3FlDwx3-$^x%4$oSxMgvwn&U^4p
zVTtW0VbAKq({4Jr#!l)#=Pi87m_hrMqtqm0Qx#tamWYWz@!<#L?md{eJqYRn@EYK3
ngBCZelu!i>0H=U`VaWaqsrxWy6P>4W00000NkvXXu0mjfoP(#T

literal 0
HcmV?d00001

diff --git a/resources/images/protocol/sip2sip/sip16x16-offline.png b/resources/images/protocol/sip2sip/sip16x16-offline.png
new file mode 100644
index 0000000000000000000000000000000000000000..8506462fc1734d50bbd2ae2eb94fdde01e11c02c
GIT binary patch
literal 612
zcmV-q0-ODbP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY=2stgn
z&vrHd000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0005QNkl<ZD9=Ta
zJ!n%=0ENGM-%Z|2@)~1FY7It%Xhakos^TVEs#Tg=p%AJl)Jd@j>L3UmR73|ib+Ajt
z%}I1>QFL(ehg!rRBs3WOw=roGlbF1`^g0;gS-ua>*$%XGv2AAn*tzR}$5@MJ6Q_p%
z+32IervM64Slj^4O*qNYjGa67(|0I%yh{CMYf$4ZhxbILMX7i@RPxrA4;Jf<v^QbB
z29UeC&;F!2ZDOT$IW~Lnn)%M}{K-hvLokBsF&M@JiRaFRwS3g;w_Y87Uqt$3Z6XWJ
zrh@I08XwpDbTkyMiLRCNrz@5Cw&za(q*hQKiSUB*0Xi0cb%^+6rPe**1g3fbL{mXg
zlpE3*&wow?_W3RuNF<lPh&dT=X7!SSs`F!Eb#yjkBXG4xqzhB8xF^R%1*A}*GC7Oy
zu`X>CK?Ih}&P`w6?!|R;;0mDsM7R*1TUJuH<Pl$>ccD)wwXMZCfV4ypGYoxuNz{|k
zg)6qb`TTrdJK3nV6fVjmp0NWs`r*@t+?#yW_52P7y^GbxMgW^Kz$gHz)Ih#p_v$U$
yU+1KE$Xc~RwZB}~;u>W}=r$tWkl%~}oxop=g`UKjhd@>U0000<MNUMnLSTZsa|pEn

literal 0
HcmV?d00001

diff --git a/resources/images/protocol/sip2sip/sip16x16-online.png b/resources/images/protocol/sip2sip/sip16x16-online.png
new file mode 100644
index 0000000000000000000000000000000000000000..389e583510c50a69e5a842801af22f302d2e05f2
GIT binary patch
literal 905
zcmV;419tq0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY=
z2sk=e2g0xb000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0008yNkl<Z
zILmF5TWC~Q6o$XO_c>=~&YaAx88xwJ5FMj7PvS#qX)2|q#aa=hQBnKgixCx~P$`;1
znch(>N*mgjS`nHSN@-t2O{ql`AB-2GQlhORCTf_OOfr*X=FFT+AErqe>V8`P&)WZ5
z|5_|~+WYS2|G6WV{)^WgTKm+0q%Sn$qnA^Ba$!>g_wG*vyz|AyS*QWfeG0-s=zY1)
z9>4qzw!5BuX^>br%fT~aSb?o1%w3eKP?`R+QJ|cMz8=_j`ZX3VK8qAZa#JTsMvDZr
z3iD!bkt^9)?l1v8MJPV!QL-ToCwpM)=j$=evxIaAC5Q2AQ!H)2&Ym?#FvV?}0#!<t
zzfgc?o&UFdMB|rU0EH%gMG7zyr;MFTmk79DgJtriZJ#>b={saIphO5|RQTxm3;>RB
z>lW7T{TAPYaGc<KFT7fTR+^K|l(S;dJk^pJ8S9}~o@V8uHQKo!es^a3SH3R+n3&vx
z=OTam9<7kw05p-y<~pazJ?Pl+F~w37ZLuyYPFVJ*SI=!k%yy6;7fcpwC`YNjM|mDx
zPZ5c{@rR|S(F7<RAxw;2t43VOJtb&!T{3vW69B|JXLz=?!1DH1EDNFu2*)8{`WPW$
z+#DDe{U2PjB|qzeJqS8$4q0?*C;+0V%}f@3s<w?4G4YX1JVuO<2<)=wVwmXiq8PpV
zoRmasE=K|I{JH}+f7ng(m2r}<-_zp@i@Gwt4#D<z2($5UflcrGY(M4`Y4N3?cWwqs
z1tl-;h5o~Ryt%G|DNLuM%l4m%Z!AM|rYW$W;&hOq+oN0=yiX}-dp>E5Spm-#cpk|5
zGB|MhPlj(TXS6gV$8OAc)u>KkEJD1+5QV`R-+8=Zu6oRZi7DzsJoqDg_I6!#_lYjQ
zl>f@Bk-#n^p8O3%166;ju%Dndiqfu<NIc=;Bd6iWRL80Yd;+vKNCFGcND|azSdjp!
f=6b^XC;<Ne&&LKZLEc3A00000NkvXXu0mjfURsd>

literal 0
HcmV?d00001

diff --git a/resources/images/protocol/sip2sip/sip16x16-phone.png b/resources/images/protocol/sip2sip/sip16x16-phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..914d2e78c3dfdb945825d8e8572d44b9f9122576
GIT binary patch
literal 956
zcmV;t14I0YP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY=
z2?z*IRL}GP000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0009QNkl<Z
zILmF5TWnNi5XXPt_nmY0+U;)bZo?L_nqF41@wzEmD<Y|A0Fgv35X2Z>Y$7JrL}G*o
zvsR6P#7j)ogouQMYGNY15VRs{<i(gu3P`FAOCp83m(pF@J-cVmIX-M#)5tu{{F9ma
z&-`cLM)t*-|6}`p`Ojbf#+n=Ekvg?B-haBCcTPRM1bgl45uShl=Y>!Mp#KmAys-C?
z8v5bs&nVj)$rXPi9LTWy_!L3UHX8gdQmlYE`|;8Or5p?mz{`gpqxqH-NKqhr{UFi$
z0v^pI7Jia!u}sh&$D_C7i!9D4*_48V1F-GAjrjd1@af=-j^kR_X-$msQgR=DagI7q
zg`zou0<_?F^X)?#NB06KG;s_mz-TyR>}<VFz(ot%<ip$Ft@fwRlSzXTK9pfH_&^$f
zs<3M#tl9NBt^<Jx-q*W(O^DMNZKRYDD`IL{`tPX$3Z+@@SdrAe{ql$E0)OSY5`b$n
zTXAgU_eapCGn;@qvYG7aS+bWpcf3uZSVv2^53?GO!>Rig6%h*za(Tf_!9rD)8k)>;
zX|$bC=!qYLdJ0W|(y6y99QY<_y`Xc!c4)C}(m28q07O>Lu{=IaM<Pxz2=xsRh=9lM
zV)%q{W+eZ?<Y4)kp7y3sPEO3c`D?kus**vMMvZ}COfY%X3*riG9Wh*`$X!KX3pW&V
znhd+4I}tC5+t<n7%frESu`9mhQNWrfz?QfAiLT8Pef%#y(p=D$@u?4<OF)3ld!`RO
z+v;8$>~hVii*9lMTKDXZ@JMZm$}4$j7Yy$iV#9h9zwlQ(`^xT3k<BG&OxJl{Sv7aw
z-yJSGQVOsuXu3gUdCNVceZEIgjxBH;kTo%Q_3#D8&vtORI3}llpK~f9{aEs+J2$Lq
zGF)$nj95lfy$9D9;*XQZ$L8{xyCqV>?yu&bXL~~3+`L7uj5a$xy<J;-tb6ajRWpPT
zlq`w2dncw@LP$ycuC6vuC_Eq*Z=!Q0_Sm^ai9Z7E!Ke5$7|<0;M`*f>G&G^~GD>ri
eI<xtI%Krl7eG&RYr$nd#0000<MNUMnLSTY&Ji0{y

literal 0
HcmV?d00001

diff --git a/resources/images/protocol/sip2sip/sip16x16.png b/resources/images/protocol/sip2sip/sip16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..c902e58a79ff22bc68a57dbde94be0daabd96019
GIT binary patch
literal 882
zcmV-&1C9KNP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY=
z2^bw|OF2#e000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0008bNkl<Z
zILnoiOKePW6vlt|fA5{?jC49?T17RrC=(G;5sM;G^=w!W1QDVM@hZv!6=9*GHWeyf
z6<e&(q(MTFN-cymp7lt`)J$8ZotZx7wlnwMzr}d8VdGn!b8@~fIlmnEm(D+h3(rQ*
zYFps&y>wk#na%3sc>vmor4vn{>9Dgn-QR3;^QL1eF2{KG&%O;nP0La`Ki;7$6!<$}
za1f4{LiMBR_+2-6-7!SU`ht_Y9J*IdZssvGwE#~Jw0{Z#C;)7&1EIsE?ND{Qj<LBF
zBvUUKFdyS{_aKCgk<6mI&r5-?oLEAksze760EEM7^Om}LbiIO6qilNnB1&7cfm3Z^
z^OUo=ojqvkASpA7rvC<%KB4g>EUTJ_w6>7pLTR{qMQb>nFyX$qel%b|uU*Xa`Eg8J
zMW}u}-dzAxKSYqTFda2yT*fjX)`i}1+DO4Z>Cb*;!$q>k#tHZ2kf~3@PN~jqfldI9
z%tzz<{WOb6_hj-XBCgdWl28dicO=5erh}lb#3{YxPnskSmL)7G1D^bWs1$j~pAcnA
zAf=4Sip%UkEpGQ1yuQu2bRUWWnYoDC@|0|Sa9P(Fmo!=Rhk<PEBkoDi{xv2Y+IU2;
z2Ga-F(62+kF{GWJ7c`B;DWNH|q%9-AAgcK0f)Rwg8SClzrjSe;sJbBf)ghiYc1qn9
z!cOMev)7pl$;E2$y+<fqwIuIGzUuBvWlUXb;a~Dm&GHy3tO3Ren8xx$l0}sUb9Q$F
z)^M8&z{XQhzxNZH4isP}7D(@mZx~%Og*8wji&m`RLkPadqI_=7!;BRGy$-jEm6AUp
z0#ww)xvfy$xQCARGlaSZiS_jo3JM$<7U7q1CE7YuLjP}1Vd1a<fJYKa6jaEuikI)f
z<1Zo-9!=X*$w2>SH1#bGy_pQhD~d~dX}mSeykQ6bt-?Zn016ip(E)@bdjJ3c07*qo
IM6N<$f~3)gQ~&?~

literal 0
HcmV?d00001

diff --git a/resources/images/protocol/sip2sip/sip32x32.png b/resources/images/protocol/sip2sip/sip32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b77182f0ee5f9e6bc1d04c3c6ba8fd2f20763f3
GIT binary patch
literal 2494
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
IM6N<$f?bM%sQ>@~

literal 0
HcmV?d00001

diff --git a/resources/images/protocol/sip2sip/sip48x48.png b/resources/images/protocol/sip2sip/sip48x48.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffcaeeb8a572164e6ee4145312201df0130f06a9
GIT binary patch
literal 4545
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

literal 0
HcmV?d00001

diff --git a/resources/images/protocol/sip2sip/sip64x64.png b/resources/images/protocol/sip2sip/sip64x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c7babe0d332048429a918ca4fedc1e78be14774
GIT binary patch
literal 6662
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
QssI2007*qoM6N<$f()9rlK=n!

literal 0
HcmV?d00001

diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 06b9aaff2..e73b36b7a 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -112,6 +112,7 @@ service.gui.COMPARE_WITH_PARTNER=Compare with partner and click the padlock to c
 # keep the following string short
 service.gui.COMPARE_WITH_PARTNER_SHORT=Compare with partner: {0}
 service.gui.CONNECTING=Connecting...
+service.gui.CONNECTION=Connection
 service.gui.CONNECTION_FAILED_MSG=Connection failed for the following account: User name: {0}, Server name: {1}. Please check your network connection or contact your network administrator for more information.
 service.gui.CONNECTION_EXPIRED_MSG=You are currently disconnected from the {0} server.
 service.gui.CONTACT_NAME=Contact name
@@ -301,6 +302,7 @@ service.gui.OR_ENTER_PHONE_NUMBER=Or enter phone number here...
 service.gui.OWNER=owner of the room
 service.gui.PASSWORD=Password
 service.gui.PASTE=&Paste
+service.gui.PRESENCE=Presence
 service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' for suggestions
 service.gui.PREVIOUS=Previous
 service.gui.PREVIOUS_TOOLTIP=Browse older conversations
@@ -799,6 +801,12 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, the IP Telecommunications
 plugin.iptelaccregwizz.USERNAME=Username
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Subscribe to iptel.org
 
+# sip2sip accregwizz
+plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
+plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP and chat
+plugin.sip2sipaccregwizz.USERNAME=Username
+plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=Subscribe to sip2sip.info
+
 # key binding chooser
 plugin.keybindings.CHAT_CLOSE=Close Chat Window
 plugin.keybindings.CHAT_COPY=Copy
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
index ef56b9f18..c0d5d7f34 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
@@ -185,7 +185,6 @@ public void registerWizardPage(Object id, WizardPage page)
     {
         // Add the incoming panel to our JPanel display that is managed by
         // the CardLayout layout manager.
-
         Object wizardForm = page.getWizardForm();
         if (wizardForm instanceof Component)
             cardPanel.add((Component) wizardForm, id);
diff --git a/src/net/java/sip/communicator/plugin/iptelaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/iptelaccregwizz/FirstWizardPage.java
deleted file mode 100644
index 80022e4ca..000000000
--- a/src/net/java/sip/communicator/plugin/iptelaccregwizz/FirstWizardPage.java
+++ /dev/null
@@ -1,735 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license. See terms of license at gnu.org.
- */
-package net.java.sip.communicator.plugin.iptelaccregwizz;
-
-import java.awt.*;
-import java.awt.event.*;
-
-import javax.swing.*;
-import javax.swing.event.*;
-
-import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.util.swing.*;
-
-/**
- * The <tt>FirstWizardPage</tt> is the page, where user could enter the uin
- * and the password of the account.
- *
- * @author Yana Stamcheva
- */
-@SuppressWarnings("serial")
-public class FirstWizardPage
-    extends TransparentPanel
-    implements WizardPage, DocumentListener, ItemListener
-{
-    private static final Logger logger
-        = Logger.getLogger(FirstWizardPage.class);
-
-    /**
-     * The identifier of this wizard page.
-     */
-    public static final String FIRST_PAGE_IDENTIFIER = "FirstPageIdentifier";
-
-    /**
-     * The example text that guides the user for the format of the username.
-     */
-    public static final String USER_NAME_EXAMPLE
-        = "Ex: myusername or myusername@iptel.org";
-
-    private JPanel firstTabPanel = new TransparentPanel(new BorderLayout());
-
-    private JPanel uinPassPanel = new TransparentPanel(new BorderLayout(10, 10));
-
-    private JPanel labelsPanel = new TransparentPanel();
-
-    private JPanel valuesPanel = new TransparentPanel();
-
-    private JLabel uinLabel
-        = new JLabel(Resources.getString("plugin.iptelaccregwizz.USERNAME"));
-
-    private JLabel passLabel
-        = new JLabel(Resources.getString("service.gui.PASSWORD"));
-
-    private JPanel emptyPanel = new TransparentPanel();
-
-    private JLabel uinExampleLabel = new JLabel(USER_NAME_EXAMPLE);
-
-    private JTextField userIDField = new JTextField();
-
-    private JPasswordField passField = new JPasswordField();
-
-    private JCheckBox rememberPassBox =
-        new SIPCommCheckBox(
-            Resources.getString("service.gui.REMEMBER_PASSWORD"));
-
-    private JPanel advancedOpPanel
-        = new TransparentPanel(new BorderLayout(10, 10));
-
-    private JPanel labelsAdvOpPanel
-        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
-
-    private JPanel valuesAdvOpPanel
-        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
-
-    private JLabel serverLabel
-        = new JLabel(Resources.getString("plugin.sipaccregwizz.REGISTRAR"));
-
-    private JCheckBox enableDefaultEncryption =
-        new SIPCommCheckBox(Resources
-            .getString("plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION"), true);
-
-    private JCheckBox enableSipZrtpAttribute =
-        new SIPCommCheckBox(Resources
-            .getString("plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE"), true);
-
-    private JLabel proxyLabel
-        = new JLabel(Resources.getString("plugin.sipaccregwizz.PROXY"));
-
-    private JLabel authNameLabel =
-        new JLabel(Resources.getString("plugin.sipaccregwizz.AUTH_NAME"));
-
-    private JLabel serverPortLabel =
-        new JLabel(Resources.getString("plugin.sipaccregwizz.SERVER_PORT"));
-
-    private JLabel proxyPortLabel =
-        new JLabel(Resources.getString("plugin.sipaccregwizz.PROXY_PORT"));
-
-    private JLabel transportLabel =
-        new JLabel(Resources.getString(
-            "plugin.sipaccregwizz.PREFERRED_TRANSPORT"));
-
-    private JTextField serverField = new JTextField();
-
-    private JTextField proxyField = new JTextField();
-
-    private JTextField authNameField = new JTextField();
-
-    private JTextField serverPortField
-        = new JTextField(IptelAccountRegistration.DEFAULT_PORT);
-
-    private JTextField proxyPortField
-        = new JTextField(IptelAccountRegistration.DEFAULT_PORT);
-
-    private JComboBox transportCombo = new JComboBox(new Object[]
-    { "UDP", "TCP", "TLS" });
-
-    private JPanel presenceOpPanel
-        = new TransparentPanel(new BorderLayout(10, 10));
-
-    private JPanel buttonsPresOpPanel
-        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
-
-    private JPanel labelsPresOpPanel
-        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
-
-    private JPanel valuesPresOpPanel
-        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
-
-    private JCheckBox enablePresOpButton =
-        new SIPCommCheckBox(Resources
-            .getString("plugin.sipaccregwizz.ENABLE_PRESENCE"), true);
-
-    private JCheckBox forceP2PPresOpButton =
-        new SIPCommCheckBox(Resources
-            .getString("plugin.sipaccregwizz.FORCE_P2P_PRESENCE"), false);
-
-    private JLabel pollPeriodLabel = new JLabel(
-        Resources.getString(
-            "plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD"));
-
-    private JLabel subscribeExpiresLabel = new JLabel(
-        Resources.getString("plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION"));
-
-    private JTextField pollPeriodField
-        = new JTextField(IptelAccountRegistration.DEFAULT_POLL_PERIOD);
-
-    private JTextField subscribeExpiresField =
-        new JTextField(IptelAccountRegistration.DEFAULT_SUBSCRIBE_EXPIRES);
-
-    private JPanel keepAlivePanel
-        = new TransparentPanel(new BorderLayout(10, 10));
-
-    private JPanel keepAliveLabels
-        = new TransparentPanel(new GridLayout(0, 1, 5, 5));
-
-    private JPanel keepAliveValues
-        = new TransparentPanel(new GridLayout(0, 1, 5, 5));
-
-    private JLabel keepAliveMethodLabel = new JLabel(
-        Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_METHOD"));
-
-    private JLabel keepAliveIntervalLabel = new JLabel(
-        Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL"));
-
-    private JLabel keepAliveIntervalExampleLabel = new JLabel(
-        Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO"));
-
-    private JComboBox keepAliveMethodBox
-        = new JComboBox(new Object []
-                                    {
-                                        "REGISTER",
-                                        "OPTIONS"
-                                    });
-
-    private JTextField keepAliveIntervalValue = new JTextField();
-
-    private JTabbedPane tabbedPane = new SIPCommTabbedPane(false, false);
-
-    private JPanel advancedPanel = new TransparentPanel();
-
-    private Object nextPageIdentifier = WizardPage.SUMMARY_PAGE_IDENTIFIER;
-
-    private IptelAccountRegistrationWizard wizard;
-
-    private boolean isCommitted = false;
-
-    private boolean isServerOverridden = false;
-
-    /**
-     * Creates an instance of <tt>FirstWizardPage</tt>.
-     *
-     * @param wizard the parent wizard
-     */
-    public FirstWizardPage(IptelAccountRegistrationWizard wizard)
-    {
-        super(new BorderLayout());
-
-        this.wizard = wizard;
-
-        advancedPanel.setLayout(new BoxLayout(advancedPanel, BoxLayout.Y_AXIS));
-
-        this.init();
-
-        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-
-        this.labelsPanel
-            .setLayout(new BoxLayout(labelsPanel, BoxLayout.Y_AXIS));
-
-        this.valuesPanel
-            .setLayout(new BoxLayout(valuesPanel, BoxLayout.Y_AXIS));
-    }
-
-    /**
-     * Initializes all panels, buttons, etc.
-     */
-    private void init()
-    {
-        this.labelsPanel.setOpaque(false);
-        this.valuesPanel.setOpaque(false);
-        this.uinPassPanel.setOpaque(false);
-        this.emptyPanel.setOpaque(false);
-
-        this.userIDField.getDocument().addDocumentListener(this);
-        this.transportCombo.addItemListener(this);
-        this.rememberPassBox.setSelected(true);
-
-        this.uinExampleLabel.setForeground(Color.GRAY);
-        this.uinExampleLabel.setFont(uinExampleLabel.getFont().deriveFont(8));
-        this.emptyPanel.setMaximumSize(new Dimension(40, 35));
-        this.uinExampleLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 8,
-            0));
-
-        labelsPanel.add(uinLabel);
-        labelsPanel.add(emptyPanel);
-        labelsPanel.add(passLabel);
-
-        valuesPanel.add(userIDField);
-        valuesPanel.add(uinExampleLabel);
-        valuesPanel.add(passField);
-
-        uinPassPanel.add(labelsPanel, BorderLayout.WEST);
-        uinPassPanel.add(valuesPanel, BorderLayout.CENTER);
-
-        TransparentPanel southPanel
-            = new TransparentPanel(new GridLayout(1, 2));
-        southPanel.add(rememberPassBox);
-        southPanel.add(createSubscribeLabel());
-
-        uinPassPanel.add(southPanel, BorderLayout.SOUTH);
-
-        uinPassPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("plugin.sipaccregwizz.USERNAME_AND_PASSWORD")));
-
-        firstTabPanel.add(uinPassPanel, BorderLayout.NORTH);
-
-        tabbedPane.addTab(  Resources.getString("service.gui.SUMMARY"),
-                            firstTabPanel);
-
-        transportCombo
-            .setSelectedItem(IptelAccountRegistration.DEFAULT_TRANSPORT);
-
-        labelsAdvOpPanel.add(serverLabel);
-        labelsAdvOpPanel.add(authNameLabel);
-        labelsAdvOpPanel.add(serverPortLabel);
-        labelsAdvOpPanel.add(proxyLabel);
-        labelsAdvOpPanel.add(proxyPortLabel);
-        labelsAdvOpPanel.add(transportLabel);
-
-        valuesAdvOpPanel.add(serverField);
-        valuesAdvOpPanel.add(authNameField);
-        valuesAdvOpPanel.add(serverPortField);
-        valuesAdvOpPanel.add(proxyField);
-        valuesAdvOpPanel.add(proxyPortField);
-        valuesAdvOpPanel.add(transportCombo);
-
-        advancedOpPanel.add(labelsAdvOpPanel, BorderLayout.WEST);
-        advancedOpPanel.add(valuesAdvOpPanel, BorderLayout.CENTER);
-
-        JPanel encryptionPanel = new TransparentPanel(new GridLayout(1, 2, 2, 2));
-        encryptionPanel.add(enableDefaultEncryption, BorderLayout.WEST);
-        encryptionPanel.add(enableSipZrtpAttribute, BorderLayout.EAST);
-
-        enableDefaultEncryption.addActionListener(new ActionListener()
-        {
-            public void actionPerformed(ActionEvent evt)
-            {
-                // Perform action
-                JCheckBox cb = (JCheckBox) evt.getSource();
-
-                enableSipZrtpAttribute.setEnabled(cb.isSelected());
-            }
-        });
-        
-        advancedOpPanel.add(encryptionPanel, BorderLayout.SOUTH);
-
-        advancedOpPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("plugin.aimaccregwizz.ADVANCED_OPTIONS")));
-
-        advancedPanel.add(advancedOpPanel);
-
-        enablePresOpButton.addActionListener(new ActionListener()
-        {
-            public void actionPerformed(ActionEvent evt)
-            {
-                // Perform action
-                JCheckBox cb = (JCheckBox) evt.getSource();
-
-                setPresenceOptionsEnabled(cb.isSelected());
-            }
-        });
-
-        labelsPresOpPanel.add(pollPeriodLabel);
-        labelsPresOpPanel.add(subscribeExpiresLabel);
-
-        valuesPresOpPanel.add(pollPeriodField);
-        valuesPresOpPanel.add(subscribeExpiresField);
-
-        buttonsPresOpPanel.add(enablePresOpButton);
-        buttonsPresOpPanel.add(forceP2PPresOpButton);
-
-        presenceOpPanel.add(buttonsPresOpPanel, BorderLayout.NORTH);
-        presenceOpPanel.add(labelsPresOpPanel, BorderLayout.WEST);
-        presenceOpPanel.add(valuesPresOpPanel, BorderLayout.CENTER);
-
-        presenceOpPanel.setBorder(BorderFactory.createTitledBorder(
-            Resources.getString("plugin.sipaccregwizz.PRESENCE_OPTIONS")));
-
-        advancedPanel.add(presenceOpPanel);
-
-        JPanel emptyLabelPanel = new TransparentPanel();
-        emptyLabelPanel.setMaximumSize(new Dimension(40, 35));
-
-        keepAliveLabels.add(keepAliveMethodLabel);
-        keepAliveLabels.add(keepAliveIntervalLabel);
-        keepAliveLabels.add(emptyLabelPanel);
-
-        this.keepAliveIntervalExampleLabel.setForeground(Color.GRAY);
-        this.keepAliveIntervalExampleLabel
-            .setFont(uinExampleLabel.getFont().deriveFont(8));
-        this.keepAliveIntervalExampleLabel
-            .setMaximumSize(new Dimension(40, 35));
-        this.keepAliveIntervalExampleLabel
-            .setBorder(BorderFactory.createEmptyBorder(0, 0, 8, 0));
-
-        keepAliveIntervalValue
-            .setText(IptelAccountRegistration.DEFAULT_KEEP_ALIVE_INTERVAL);
-
-        keepAliveMethodBox.setSelectedItem(
-            IptelAccountRegistration.DEFAULT_KEEP_ALIVE_METHOD);
-
-        keepAliveValues.add(keepAliveMethodBox);
-        keepAliveValues.add(keepAliveIntervalValue);
-        keepAliveValues.add(keepAliveIntervalExampleLabel);
-
-        keepAlivePanel.add(keepAliveLabels, BorderLayout.WEST);
-        keepAlivePanel.add(keepAliveValues, BorderLayout.CENTER);
-
-        keepAlivePanel.setBorder(BorderFactory.createTitledBorder(
-            Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE")));
-
-        advancedPanel.add(keepAlivePanel);
-
-        tabbedPane.addTab(
-            Resources.getString("service.gui.ADVANCED"),
-            advancedPanel);
-
-        this.add(tabbedPane, BorderLayout.NORTH);
-    }
-
-    /**
-     * Creates the subscribe label.
-     * @return the newly created subscribe label
-     */
-    private Component createSubscribeLabel()
-    {
-        JLabel subscribeLabel =
-            new JLabel("<html><a href=''>"
-                + Resources.getString("plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE")
-                + "</a></html>",
-                JLabel.RIGHT);
-
-        subscribeLabel.setCursor(new Cursor(Cursor.HAND_CURSOR));
-        subscribeLabel.setToolTipText(
-            Resources.getString("plugin.simpleaccregwizz.SPECIAL_SIGNUP"));
-        subscribeLabel.addMouseListener(new MouseAdapter()
-        {
-            public void mousePressed(MouseEvent e)
-            {
-                try
-                {
-                    wizard.webSignup();
-                }
-                catch (UnsupportedOperationException ex)
-                {
-                    // This should not happen, because we check if the
-                    // operation is supported, before adding the sign
-                    // up.
-                    logger.error("The web sign up is not supported.",
-                        ex);
-                }
-            }
-        });
-
-        return subscribeLabel;
-    }
-
-    /**
-     * Implements the <code>WizardPage.getIdentifier</code> to return this
-     * page identifier.
-     * @return the identifier of this page
-     */
-    public Object getIdentifier()
-    {
-        return FIRST_PAGE_IDENTIFIER;
-    }
-
-    /**
-     * Implements the <code>WizardPage.getNextPageIdentifier</code> to return
-     * the next page identifier - the summary page.
-     * @return the next page identifier
-     */
-    public Object getNextPageIdentifier()
-    {
-        return nextPageIdentifier;
-    }
-
-    /**
-     * Implements the <code>WizardPage.getBackPageIdentifier</code> to return
-     * the back identifier. In this case it's null because this is the first
-     * wizard page.
-     * @return the identifier of the previous wizard page
-     */
-    public Object getBackPageIdentifier()
-    {
-        return null;
-    }
-
-    /**
-     * Implements the <code>WizardPage.getWizardForm</code> to return this
-     * panel.
-     * @return the wizard form
-     */
-    public Object getWizardForm()
-    {
-        return this;
-    }
-
-    /**
-     * Before this page is displayed enables or disables the "Next" wizard
-     * button according to whether the UIN field is empty.
-     */
-    public void pageShowing()
-    {
-        this.setNextButtonAccordingToUIN();
-        wizard.getWizardContainer().setBackButtonEnabled(false);
-    }
-
-    /**
-     * Saves the user input when the "Next" wizard buttons is clicked.
-     */
-    public void commitPage()
-    {
-        String uin = userIDField.getText();
-        int indexOfSeparator = uin.indexOf('@');
-        if (indexOfSeparator > -1) {
-            uin = uin.substring(0, indexOfSeparator);
-        }
-
-        IptelAccountRegistration registration = wizard.getRegistration();
-
-        String userID = userIDField.getText();
-
-        if(userID == null || userID.trim().length() == 0)
-            throw new IllegalStateException("No user ID provided.");
-
-        registration.setUserID(userID);
-
-        if (passField.getPassword() != null)
-            registration.setPassword(new String(passField.getPassword()));
-
-        registration.setRememberPassword(rememberPassBox.isSelected());
-
-        if (serverField.getText() != null && serverField.getText().length() > 0)
-            registration.setServerAddress(serverField.getText());
-
-        String authName = authNameField.getText();
-        if(authName != null && authName.length() > 0)
-            registration.setAuthorizationName(authName);
-
-        registration.setServerPort(serverPortField.getText());
-        registration.setProxy(proxyField.getText());
-        registration.setProxyPort(proxyPortField.getText());
-        registration.setPreferredTransport(transportCombo.getSelectedItem()
-            .toString());
-
-        registration.setEnablePresence(enablePresOpButton.isSelected());
-        registration.setForceP2PMode(forceP2PPresOpButton.isSelected());
-        registration.setDefaultEncryption(enableDefaultEncryption.isSelected());
-        registration.setSipZrtpAttribute(enableSipZrtpAttribute.isSelected());
-        registration.setPollingPeriod(pollPeriodField.getText());
-        registration.setSubscriptionExpiration(subscribeExpiresField
-            .getText());
-        registration.setKeepAliveMethod(
-            keepAliveMethodBox.getSelectedItem().toString());
-        registration.setKeepAliveInterval(keepAliveIntervalValue.getText());
-
-        wizard.getWizardContainer().setBackButtonEnabled(true);
-
-        nextPageIdentifier = SUMMARY_PAGE_IDENTIFIER;
-
-        this.isCommitted = true;
-    }
-
-    /**
-     * Enables or disables the "Next" wizard button according to whether the UIN
-     * field is empty.
-     */
-    private void setNextButtonAccordingToUIN()
-    {
-        if (userIDField.getText() == null || userIDField.getText().equals(""))
-        {
-            wizard.getWizardContainer().setNextFinishButtonEnabled(false);
-        }
-        else
-        {
-            wizard.getWizardContainer().setNextFinishButtonEnabled(true);
-        }
-    }
-
-    /**
-     * Handles the <tt>DocumentEvent</tt> triggered when user types in the UIN
-     * field. Enables or disables the "Next" wizard button according to whether
-     * the UIN field is empty.
-     * @param e the <tt>DocumentEvent</tt> that notified us
-     */
-    public void insertUpdate(DocumentEvent e)
-    {
-        this.setNextButtonAccordingToUIN();
-        this.setServerFieldAccordingToUIN();
-    }
-
-    /**
-     * Handles the <tt>DocumentEvent</tt> triggered when user deletes letters
-     * from the UIN field. Enables or disables the "Next" wizard button
-     * according to whether the UIN field is empty.
-     * @param e the <tt>DocumentEvent</tt>
-     */
-    public void removeUpdate(DocumentEvent e)
-    {
-        this.setNextButtonAccordingToUIN();
-        this.setServerFieldAccordingToUIN();
-    }
-
-    public void changedUpdate(DocumentEvent e) {}
-
-    public void pageHiding() {}
-
-    public void pageShown() {}
-
-    public void pageBack() {}
-
-    /**
-     * Fills the UIN and Password fields in this panel with the data coming from
-     * the given protocolProvider.
-     *
-     * @param protocolProvider The <tt>ProtocolProviderService</tt> to load
-     *            the data from.
-     */
-    public void loadAccount(ProtocolProviderService protocolProvider)
-    {
-        AccountID accountID = protocolProvider.getAccountID();
-        String password = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.PASSWORD);
-
-        String serverAddress = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.SERVER_ADDRESS);
-
-        String authName = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.AUTHORIZATION_NAME);
-
-        String serverPort = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.SERVER_PORT);
-
-        String proxyAddress = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.PROXY_ADDRESS);
-
-        String proxyPort = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.PROXY_PORT);
-
-        String preferredTransport = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.PREFERRED_TRANSPORT);
-
-        boolean enablePresence = accountID.getAccountPropertyBoolean(
-                            ProtocolProviderFactory.IS_PRESENCE_ENABLED, false);
-
-        boolean forceP2P = accountID.getAccountPropertyBoolean(
-                            ProtocolProviderFactory.FORCE_P2P_MODE, false);
-
-        boolean enabledDefaultEncryption = accountID.getAccountPropertyBoolean(
-                            ProtocolProviderFactory.DEFAULT_ENCRYPTION, true);
-
-        boolean enabledSipZrtpAttribute = accountID.getAccountPropertyBoolean(
-                ProtocolProviderFactory.DEFAULT_SIPZRTP_ATTRIBUTE, true);
-
-
-        String pollingPeriod = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.POLLING_PERIOD);
-
-        String subscriptionPeriod = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.SUBSCRIPTION_EXPIRATION);
-
-        String keepAliveMethod =
-            accountID.getAccountPropertyString("KEEP_ALIVE_METHOD");
-
-        String keepAliveInterval =
-            accountID.getAccountPropertyString("KEEP_ALIVE_INTERVAL");
-
-        this.isServerOverridden = accountID.getAccountPropertyBoolean(
-            ProtocolProviderFactory.IS_SERVER_OVERRIDDEN, false);
-
-        userIDField.setEnabled(false);
-        this.userIDField.setText((serverAddress == null) ? accountID.getUserID()
-            : (accountID.getUserID() + "@" + serverAddress));
-
-        if (password != null)
-        {
-            this.passField.setText(password);
-            this.rememberPassBox.setSelected(true);
-        }
-
-        serverField.setText(serverAddress);
-        serverField.setEnabled(false);
-
-        if(authName != null && authName.length() > 0)
-            authNameField.setText(authName);
-
-        serverPortField.setText(serverPort);
-        proxyField.setText(proxyAddress);
-
-        // The order of the next two fields is important, as a change listener
-        // of the transportCombo sets the proxyPortField to its default
-        transportCombo.setSelectedItem(preferredTransport);
-        proxyPortField.setText(proxyPort);
-
-        enablePresOpButton.setSelected(enablePresence);
-        forceP2PPresOpButton.setSelected(forceP2P);
-
-        enableDefaultEncryption.setSelected(enabledDefaultEncryption);
-        enableSipZrtpAttribute.setSelected(enabledSipZrtpAttribute);
-        enableSipZrtpAttribute.setEnabled(enabledDefaultEncryption);
-        
-        pollPeriodField.setText(pollingPeriod);
-        subscribeExpiresField.setText(subscriptionPeriod);
-
-        if (!enablePresence)
-        {
-            setPresenceOptionsEnabled(enablePresence);
-        }
-
-        keepAliveMethodBox.setSelectedItem(keepAliveMethod);
-        keepAliveIntervalValue.setText(keepAliveInterval);
-    }
-
-    /**
-     * Parse the server part from the sip id and set it to server as default
-     * value. If Advanced option is enabled Do nothing.
-     */
-    private void setServerFieldAccordingToUIN()
-    {
-        String serverAddress
-            = wizard.getServerFromUserName(userIDField.getText());
-
-        if (!wizard.isModification() || !isServerOverridden)
-        {
-            serverField.setText(serverAddress);
-            proxyField.setText(serverAddress);
-        }
-    }
-
-    /**
-     * Enables or disable all presence related options.
-     *
-     * @param isEnabled <code>true</code> to enable the presence related
-     * options, <code>false</code> - to disable them.
-     */
-    private void setPresenceOptionsEnabled(boolean isEnabled)
-    {
-        forceP2PPresOpButton.setEnabled(isEnabled);
-        pollPeriodField.setEnabled(isEnabled);
-        subscribeExpiresField.setEnabled(isEnabled);
-    }
-
-    /**
-     * Sets the proxy and server ports depending on the selected transport type.
-     * @param e the <tt>ItemEvent</tt> that notified us
-     */
-    public void itemStateChanged(ItemEvent e)
-    {
-        if (e.getStateChange() == ItemEvent.SELECTED
-            && e.getItem().equals("TLS"))
-        {
-            serverPortField.setText(IptelAccountRegistration.DEFAULT_TLS_PORT);
-            proxyPortField.setText(IptelAccountRegistration.DEFAULT_TLS_PORT);
-        }
-        else
-        {
-            serverPortField.setText(IptelAccountRegistration.DEFAULT_PORT);
-            proxyPortField.setText(IptelAccountRegistration.DEFAULT_PORT);
-        }
-    }
-
-    /**
-     * Returns the simple form shown by default.
-     * @return the simple form shown by default
-     */
-    public Object getSimpleForm()
-    {
-        return uinPassPanel;
-    }
-
-    /**
-     * Returns <tt>true</tt> if the form is committed, <tt>false</tt> -
-     * otherwise.
-     * @return <tt>true</tt> if the form is committed, <tt>false</tt> -
-     * otherwise
-     */
-    public boolean isCommitted()
-    {
-        return isCommitted;
-    }
-}
diff --git a/src/net/java/sip/communicator/plugin/iptelaccregwizz/IptelAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/iptelaccregwizz/IptelAccRegWizzActivator.java
index 515149321..03fb48096 100644
--- a/src/net/java/sip/communicator/plugin/iptelaccregwizz/IptelAccRegWizzActivator.java
+++ b/src/net/java/sip/communicator/plugin/iptelaccregwizz/IptelAccRegWizzActivator.java
@@ -13,6 +13,7 @@
 import net.java.sip.communicator.service.browserlauncher.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
 /**
@@ -30,6 +31,8 @@ public class IptelAccRegWizzActivator
 
     private static BrowserLauncherService browserLauncherService;
 
+    private static ResourceManagementService resourcesService;
+
     private static UIService uiService;
 
     /**
@@ -99,23 +102,34 @@ public static UIService getUIService()
     {
         return uiService;
     }
-    
+
     /**
      * Returns the <tt>BrowserLauncherService</tt> obtained from the bundle
      * context.
      * @return the <tt>BrowserLauncherService</tt> obtained from the bundle
      * context
      */
-    public static BrowserLauncherService getBrowserLauncher() {
+    public static BrowserLauncherService getBrowserLauncher()
+    {
         if (browserLauncherService == null)
         {
-            browserLauncherService =
-                (BrowserLauncherService) bundleContext
-                    .getService(bundleContext
-                        .getServiceReference(BrowserLauncherService.class
-                            .getName()));
+            browserLauncherService
+                = (BrowserLauncherService) bundleContext.getService(
+                    bundleContext.getServiceReference(
+                        BrowserLauncherService.class.getName()));
         }
-
         return browserLauncherService;
     }
+
+    /**
+     * Returns the service giving access to resources.
+     * @return the service giving access to resources
+     */
+    public static ResourceManagementService getResources()
+    {
+        if (resourcesService == null)
+            resourcesService = ResourceManagementServiceUtils
+                .getService(IptelAccRegWizzActivator.bundleContext);
+        return resourcesService;
+    }
 }
diff --git a/src/net/java/sip/communicator/plugin/iptelaccregwizz/IptelAccountRegistration.java b/src/net/java/sip/communicator/plugin/iptelaccregwizz/IptelAccountRegistration.java
deleted file mode 100644
index 1019050f5..000000000
--- a/src/net/java/sip/communicator/plugin/iptelaccregwizz/IptelAccountRegistration.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license. See terms of license at gnu.org.
- */
-package net.java.sip.communicator.plugin.iptelaccregwizz;
-
-/**
- * The <tt>IptelAccountRegistration</tt> is used to store all user input data
- * through the <tt>IptelAccountRegistrationWizard</tt>.
- *
- * @author Yana Stamcheva
- */
-public class IptelAccountRegistration
-{
-    /**
-     * The default port.
-     */
-    public static String DEFAULT_PORT = "5060";
-
-    /**
-     * The default TLS port.
-     */
-    public static String DEFAULT_TLS_PORT = "5061";
-
-    /**
-     * The default transport.
-     */
-    public static String DEFAULT_TRANSPORT = "TCP";
-
-    /**
-     * The default poll period.
-     */
-    public static String DEFAULT_POLL_PERIOD = "30";
-
-    /**
-     * The default subscribe expiration time in milliseconds.
-     */
-    public static String DEFAULT_SUBSCRIBE_EXPIRES = "3600";
-
-    /**
-     * The default keep alive method.
-     */
-    public static String DEFAULT_KEEP_ALIVE_METHOD = "REGISTER";
-
-    /**
-     * The default keep alive interval.
-     */
-    public static String DEFAULT_KEEP_ALIVE_INTERVAL = "25";
-
-    /**
-     * The iptel.org default server address.
-     */
-    static final String IPTEL_CONNECT_SRV = "iptel.org";
-
-    private String id;
-
-    private String password;
-
-    private boolean rememberPassword = true;
-
-    private String serverAddress = IPTEL_CONNECT_SRV;
-
-    private String authorizationName;
-
-    private String serverPort = DEFAULT_PORT;
-
-    private String proxyPort = DEFAULT_PORT;
-
-    private String proxy;
-
-    private String preferredTransport = DEFAULT_TRANSPORT;
-
-    private boolean enablePresence = true;
-
-    private boolean forceP2PMode = false;
-
-    private boolean defaultEncryption = false;
-
-    private boolean sipZrtpAttribute = false;
-
-    private String pollingPeriod = DEFAULT_POLL_PERIOD;
-
-    private String subscriptionExpiration = DEFAULT_SUBSCRIBE_EXPIRES;
-
-    private String keepAliveMethod = DEFAULT_KEEP_ALIVE_METHOD;
-
-    private String keepAliveInterval = DEFAULT_KEEP_ALIVE_INTERVAL;
-
-    /**
-     * Returns the preferred transport to use.
-     * @return the preferred transport to use
-     */
-    public String getPreferredTransport()
-    {
-        return preferredTransport;
-    }
-
-    /**
-     * Sets the preferred transport to use.
-     * @param preferredTransport the transport to set
-     */
-    public void setPreferredTransport(String preferredTransport)
-    {
-        this.preferredTransport = preferredTransport;
-    }
-
-    /**
-     * Returns the proxy.
-     * @return the proxy
-     */
-    public String getProxy()
-    {
-        return proxy;
-    }
-
-    /**
-     * Sets the proxy
-     * @param proxy the proxy to set
-     */
-    public void setProxy(String proxy)
-    {
-        this.proxy = proxy;
-    }
-
-    /**
-     * Returns the password of the sip registration account.
-     *
-     * @return the password of the sip registration account.
-     */
-    public String getPassword()
-    {
-        return password;
-    }
-
-    /**
-     * Sets the password of the sip registration account.
-     *
-     * @param password the password of the sip registration account.
-     */
-    public void setPassword(String password)
-    {
-        this.password = password;
-    }
-
-    /**
-     * Returns TRUE if password has to remembered, FALSE otherwise.
-     *
-     * @return TRUE if password has to remembered, FALSE otherwise
-     */
-    public boolean isRememberPassword()
-    {
-        return rememberPassword;
-    }
-
-    /**
-     * Sets the rememberPassword value of this sip account registration.
-     *
-     * @param rememberPassword TRUE if password has to remembered, FALSE
-     *            otherwise
-     */
-    public void setRememberPassword(boolean rememberPassword)
-    {
-        this.rememberPassword = rememberPassword;
-    }
-
-    /**
-     * Returns the UIN of the sip registration account.
-     *
-     * @return the UIN of the sip registration account.
-     */
-    public String getId()
-    {
-        String serverAddress = getServerAddress();
-
-        return
-            ((id != null)
-                    && (id.indexOf('@') < 0)
-                    && ((serverAddress == null)
-                            || serverAddress.equals(IPTEL_CONNECT_SRV)))
-                ? (id + '@' + IPTEL_CONNECT_SRV)
-                : id;
-    }
-
-    /**
-     * The address of the server we will use for this account
-     *
-     * @return String
-     */
-    public String getServerAddress()
-    {
-        return serverAddress;
-    }
-
-    /**
-     * The port on the specified server
-     *
-     * @return int
-     */
-    public String getServerPort()
-    {
-        return serverPort;
-    }
-
-    /**
-     * The authorization name
-     *
-     * @return String auth name
-     */
-    public String getAuthorizationName()
-    {
-        return authorizationName;
-    }
-
-    /**
-     * The port on the specified proxy
-     *
-     * @return int
-     */
-    public String getProxyPort()
-    {
-        return proxyPort;
-    }
-
-    /**
-     * Sets the identifier of the sip registration account.
-     *
-     * @param id the identifier of the sip registration account.
-     */
-    public void setUserID(String id)
-    {
-        this.id = id;
-    }
-
-    /**
-     * Sets the server
-     *
-     * @param serverAddress String
-     */
-    public void setServerAddress(String serverAddress)
-    {
-        this.serverAddress = serverAddress;
-    }
-
-    /**
-     * Sets the server port.
-     *
-     * @param port int
-     */
-    public void setServerPort(String port)
-    {
-        this.serverPort = port;
-    }
-
-    /**
-     * Sets authorization name.
-     *
-     * @param authName String
-     */
-    public void setAuthorizationName(String authName)
-    {
-        this.authorizationName = authName;
-    }
-
-    /**
-     * Sets the proxy port.
-     *
-     * @param port int
-     */
-    public void setProxyPort(String port)
-    {
-        this.proxyPort = port;
-    }
-
-    /**
-     * If the presence is enabled
-     *
-     * @return If the presence is enabled
-     */
-    public boolean isEnablePresence()
-    {
-        return enablePresence;
-    }
-
-    /**
-     * If the p2p mode is forced
-     *
-     * @return If the p2p mode is forced
-     */
-    public boolean isForceP2PMode()
-    {
-        return forceP2PMode;
-    }
-
-    /**
-     * The offline contact polling period
-     *
-     * @return the polling period
-     */
-    public String getPollingPeriod()
-    {
-        return pollingPeriod;
-    }
-
-    /**
-     * The default expiration of subscriptions
-     *
-     * @return the subscription expiration
-     */
-    public String getSubscriptionExpiration()
-    {
-        return subscriptionExpiration;
-    }
-
-    /**
-     * Sets if the presence is enabled
-     *
-     * @param enablePresence if the presence is enabled
-     */
-    public void setEnablePresence(boolean enablePresence)
-    {
-        this.enablePresence = enablePresence;
-    }
-
-    /**
-     * Sets if we have to force the p2p mode
-     *
-     * @param forceP2PMode if we have to force the p2p mode
-     */
-    public void setForceP2PMode(boolean forceP2PMode)
-    {
-        this.forceP2PMode = forceP2PMode;
-    }
-
-    /**
-     * Sets the offline contacts polling period
-     *
-     * @param pollingPeriod the offline contacts polling period
-     */
-    public void setPollingPeriod(String pollingPeriod)
-    {
-        this.pollingPeriod = pollingPeriod;
-    }
-
-    /**
-     * Sets the subscription expiration value
-     *
-     * @param subscriptionExpiration the subscription expiration value
-     */
-    public void setSubscriptionExpiration(String subscriptionExpiration)
-    {
-        this.subscriptionExpiration = subscriptionExpiration;
-    }
-
-    /**
-     * Returns the keep alive method.
-     *
-     * @return the keep alive method.
-     */
-    public String getKeepAliveMethod()
-    {
-        return keepAliveMethod;
-    }
-
-    /**
-     * Sets the keep alive method.
-     *
-     * @param keepAliveMethod the keep alive method to set
-     */
-    public void setKeepAliveMethod(String keepAliveMethod)
-    {
-        this.keepAliveMethod = keepAliveMethod;
-    }
-
-    /**
-     * Returns the keep alive interval.
-     *
-     * @return the keep alive interval
-     */
-    public String getKeepAliveInterval()
-    {
-        return keepAliveInterval;
-    }
-
-    /**
-     * Sets the keep alive interval.
-     *
-     * @param keepAliveInterval the keep alive interval to set
-     */
-    public void setKeepAliveInterval(String keepAliveInterval)
-    {
-        this.keepAliveInterval = keepAliveInterval;
-    }
-
-    /**
-     * If default call encryption is enabled
-     *
-     * @return If default call encryption is enabled
-     */
-    public boolean isDefaultEncryption()
-    {
-        return defaultEncryption;
-    }
-
-    /**
-     * Sets default call encryption
-     *
-     * @param defaultEncryption if we want to set call encryption on as default
-     */
-    public void setDefaultEncryption(boolean defaultEncryption)
-    {
-        this.defaultEncryption = defaultEncryption;
-    }
-
-    /**
-     * Sets SIP ZRTP attribute support
-     *
-     * @param sipZrtpAttribute include the ZRTP attribute to SIP/SDP
-     */
-    public void setSipZrtpAttribute(boolean sipZrtpAttribute) {
-        this.sipZrtpAttribute = sipZrtpAttribute;
-    }
-
-
-    /**
-     * Check if to include the ZRTP attribute to SIP/SDP
-     *
-     * @return include the ZRTP attribute to SIP/SDP
-     */
-    public boolean isSipZrtpAttribute() {
-        return sipZrtpAttribute;
-    }
-}
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/iptelaccregwizz/IptelAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/iptelaccregwizz/IptelAccountRegistrationWizard.java
index 349f66d9a..df9c2a8aa 100644
--- a/src/net/java/sip/communicator/plugin/iptelaccregwizz/IptelAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/iptelaccregwizz/IptelAccountRegistrationWizard.java
@@ -6,73 +6,43 @@
  */
 package net.java.sip.communicator.plugin.iptelaccregwizz;
 
-import java.awt.*;
-import java.util.*;
-
+import net.java.sip.communicator.plugin.sipaccregwizz.*;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.*;
-
-import org.osgi.framework.*;
 
 /**
- * The <tt>IPPIAccountRegistrationWizard</tt> is an implementation of the
+ * The <tt>IptelAccountRegistrationWizard</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.
  *
  * @author Yana Stamcheva
  */
 public class IptelAccountRegistrationWizard
-    implements AccountRegistrationWizard
+    extends SIPAccountRegistrationWizard
 {
     /**
-     * The protocol name.
-     */
-    public static final String PROTOCOL = "iptel.org";
-
-    /**
-     * The first wizard page.
-     */
-    private FirstWizardPage firstWizardPage;
-
-    /**
-     * Account registration instance holding the data.
+     * A constant pointing to the IP Tel protocol logo image.
      */
-    private IptelAccountRegistration registration
-        = new IptelAccountRegistration();
+    private static final String PROTOCOL_ICON
+        = "service.protocol.iptel.IPTEL_16x16";
 
     /**
-     * The container.
+     * A constant pointing to the IP Tel protocol wizard page image.
      */
-    private final WizardContainer wizardContainer;
+    private static final String PAGE_IMAGE
+        = "service.protocol.iptel.IPTEL_64x64";
 
     /**
-     * The protocol provider.
-     */
-    private ProtocolProviderService protocolProvider;
-
-    /**
-     * Is current wizard run as modification of an existing account.
-     */
-    private boolean isModification;
-
-    /**
-     * The logger.
+     * The protocol name.
      */
-    private static final Logger logger
-        = Logger.getLogger(IptelAccountRegistrationWizard.class);
+    public static final String PROTOCOL = "iptel.org";
 
     /**
-     * Creates an instance of <tt>IPPIAccountRegistrationWizard</tt>.
-     * @param wizardContainer the wizard container, where this wizard
-     * is added
+     * Creates an instance of <tt>IptelAccountRegistrationWizard</tt>.
+     * @param wizardContainer the wizard container
      */
     public IptelAccountRegistrationWizard(WizardContainer wizardContainer)
     {
-        this.wizardContainer = wizardContainer;
-
-        this.wizardContainer.setFinishButtonText(
-            Resources.getString("service.gui.SIGN_IN"));
+        super(wizardContainer);
     }
 
     /**
@@ -82,7 +52,8 @@ public IptelAccountRegistrationWizard(WizardContainer wizardContainer)
      */
     public byte[] getIcon()
     {
-        return Resources.getImage(Resources.PROTOCOL_ICON);
+        return IptelAccRegWizzActivator.getResources()
+            .getImageInBytes(PROTOCOL_ICON);
     }
 
     /**
@@ -93,7 +64,8 @@ public byte[] getIcon()
      */
     public byte[] getPageImage()
     {
-        return Resources.getImage(Resources.PAGE_IMAGE);
+        return IptelAccRegWizzActivator.getResources()
+            .getImageInBytes(PAGE_IMAGE);
     }
 
 
@@ -104,7 +76,8 @@ public byte[] getPageImage()
      */
     public String getProtocolName()
     {
-        return Resources.getString("plugin.iptelaccregwizz.PROTOCOL_NAME");
+        return Resources.getString(
+            "plugin.iptelaccregwizz.PROTOCOL_NAME");
     }
 
     /**
@@ -114,393 +87,8 @@ public String getProtocolName()
      */
     public String getProtocolDescription()
     {
-        return Resources.getString("plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION");
-    }
-
-    /**
-     * Returns the set of pages contained in this wizard.
-     * @return Iterator
-     */
-    public Iterator<WizardPage> getPages() {
-        java.util.List<WizardPage> pages = new ArrayList<WizardPage>();
-        firstWizardPage = new FirstWizardPage(this);
-
-        pages.add(firstWizardPage);
-
-        return pages.iterator();
-    }
-
-    /**
-     * Returns the set of data that user has entered through this wizard.
-     * @return Iterator
-     */
-    public Iterator<Map.Entry<String, String>> getSummary() 
-    {
-        Hashtable<String, String> summaryTable
-            = new Hashtable<String, String>();
-
-        boolean rememberPswd = registration.isRememberPassword();
-        String rememberPswdString = Resources.getString(
-                rememberPswd ? "service.gui.YES" : "service.gui.NO");
-
-        summaryTable.put(
-            Resources.getString("plugin.sipaccregwizz.USERNAME"),
-            registration.getId());
-        summaryTable.put(
-            Resources.getString("service.gui.REMEMBER_PASSWORD"),
-            rememberPswdString);
-        summaryTable.put(
-            Resources.getString("plugin.sipaccregwizz.REGISTRAR"),
-            registration.getServerAddress());
-        summaryTable.put(
-            Resources.getString("plugin.sipaccregwizz.AUTH_NAME"),
-            registration.getAuthorizationName());
-        summaryTable.put(
-            Resources.getString("plugin.sipaccregwizz.SERVER_PORT"),
-            registration.getServerPort());
-        summaryTable.put(
-            Resources.getString("plugin.sipaccregwizz.PROXY"),
-            registration.getProxy());
-        summaryTable.put(
-            Resources.getString("plugin.sipaccregwizz.PROXY_PORT"),
-            registration.getProxyPort());
-        summaryTable.put(
-            Resources.getString("plugin.sipaccregwizz.PREFERRED_TRANSPORT"),
-            registration.getPreferredTransport());
-
-        if (registration.isEnablePresence())
-        {
-            summaryTable.put(
-                Resources.getString("plugin.sipaccregwizz.ENABLE_PRESENCE"),
-                Resources.getString("service.gui.YES"));
-        }
-        else
-        {
-            summaryTable.put(
-                Resources.getString("plugin.sipaccregwizz.ENABLE_PRESENCE"),
-                Resources.getString("service.gui.NO"));
-        }
-
-        if (registration.isForceP2PMode())
-        {
-            summaryTable.put(
-                Resources.getString("plugin.sipaccregwizz.FORCE_P2P_PRESENCE"),
-                Resources.getString("service.gui.YES"));
-        }
-        else
-        {
-            summaryTable.put(
-                Resources.getString("plugin.sipaccregwizz.FORCE_P2P_PRESENCE"),
-                Resources.getString("service.gui.NO"));
-        }
-
-        if (registration.isDefaultEncryption())
-        {
-            summaryTable.put(Resources.getString(
-                "plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION"),
-                Resources.getString("service.gui.YES"));
-        }
-        else
-        {
-            summaryTable.put(Resources.getString(
-                "plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION"),
-                Resources.getString("service.gui.NO"));
-        }
-
-        if (registration.isSipZrtpAttribute())
-        {
-            summaryTable.put(Resources.getString(
-                "plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE"),
-                Resources.getString("service.gui.YES"));
-        }
-        else
-        {
-            summaryTable.put(Resources.getString(
-                "plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE"),
-                Resources.getString("service.gui.NO"));
-        }
-
-        summaryTable.put(Resources.getString(
-                "plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD"),
-                registration.getPollingPeriod());
-        summaryTable.put(Resources.getString(
-                "plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION"),
-                registration.getSubscriptionExpiration());
-
-        summaryTable.put(
-            Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_METHOD"),
-            registration.getKeepAliveMethod());
-        summaryTable.put(
-            Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL"),
-            registration.getKeepAliveInterval());
-
-        return summaryTable.entrySet().iterator();
-    }
-
-    /**
-     * Installs the account created through this wizard.
-     * @return the created <tt>ProtocolProviderService</tt>
-     * @throws OperationFailedException if the sign in operation fails
-     */
-    public ProtocolProviderService signin()
-        throws OperationFailedException
-    {
-        firstWizardPage.commitPage();
-
-        return signin(registration.getId(), registration.getPassword());
-    }
-
-    /**
-     * Installs the account with the given user name and password.
-     * @param username the username to sign in with
-     * @param password the password used for login 
-     * @return the <tt>ProtocolProviderService</tt> corresponding to the newly
-     * created account.
-     * @throws OperationFailedException if the sign in operation fails
-     */
-    public ProtocolProviderService signin(String username, String password)
-        throws OperationFailedException
-    {
-        ProtocolProviderFactory factory
-            = IptelAccRegWizzActivator.getIptelProtocolProviderFactory();
-
-        ProtocolProviderService pps = null;
-        if (factory != null)
-            pps = this.installAccount(  factory,
-                                        username,
-                                        password);
-
-        return pps;
-    }
-
-    /**
-     * Creates an account for the given user and password.
-     *
-     * @param providerFactory the ProtocolProviderFactory which will create
-     * the account
-     * @param userName the user identifier
-     * @param passwd the password
-     * @return the <tt>ProtocolProviderService</tt> for the new account.
-     * @throws OperationFailedException if the install account operation fails
-     */
-    private ProtocolProviderService installAccount(
-            ProtocolProviderFactory providerFactory,
-            String userName,
-            String passwd)
-        throws OperationFailedException
-    {
-        Hashtable<String, String> accountProperties
-            = new Hashtable<String, String>();
-
-        /* Make the account use the resources specific to iptel.org. */
-        accountProperties.put(ProtocolProviderFactory.PROTOCOL, PROTOCOL);
-        accountProperties
-            .put(ProtocolProviderFactory.PROTOCOL_ICON_PATH,
-                "resources/images/protocol/iptel");
-
-        accountProperties.put(ProtocolProviderFactory.ACCOUNT_ICON_PATH,
-                "resources/images/protocol/iptel/sip32x32.png");
-
-        if(registration.isRememberPassword())
-        {
-            accountProperties.put(ProtocolProviderFactory.PASSWORD, passwd);
-        }
-
-        String serverAddress = null;
-        if (registration.getServerAddress() != null)
-            serverAddress = registration.getServerAddress();
-        else
-            serverAddress = getServerFromUserName(userName);
-
-        if (serverAddress != null)
-        {
-            accountProperties.put(ProtocolProviderFactory.SERVER_ADDRESS,
-                serverAddress);
-
-            if (userName.indexOf(serverAddress) < 0)
-                accountProperties.put(
-                    ProtocolProviderFactory.IS_SERVER_OVERRIDDEN,
-                    Boolean.toString(true));
-        }
-
-        if(registration.getAuthorizationName() != null)
-            accountProperties.put(ProtocolProviderFactory.AUTHORIZATION_NAME,
-                registration.getAuthorizationName());
-
-        accountProperties.put(ProtocolProviderFactory.SERVER_PORT,
-                registration.getServerPort());
-
-        String proxyAddress = null;
-        if (registration.getProxy() != null)
-            proxyAddress = registration.getProxy();
-        else
-            proxyAddress = getServerFromUserName(userName);
-
-        if (proxyAddress != null)
-            accountProperties.put(ProtocolProviderFactory.PROXY_ADDRESS,
-                proxyAddress);
-
-        accountProperties.put(ProtocolProviderFactory.PROXY_PORT,
-                registration.getProxyPort());
-
-        accountProperties.put(ProtocolProviderFactory.PREFERRED_TRANSPORT,
-                registration.getPreferredTransport());
-
-        accountProperties.put(ProtocolProviderFactory.IS_PRESENCE_ENABLED,
-                Boolean.toString(registration.isEnablePresence()));
-
-        accountProperties.put(ProtocolProviderFactory.FORCE_P2P_MODE,
-                Boolean.toString(registration.isForceP2PMode()));
-
-        accountProperties.put(ProtocolProviderFactory.DEFAULT_ENCRYPTION,
-                Boolean.toString(registration.isDefaultEncryption()));
-
-        accountProperties.put(ProtocolProviderFactory.DEFAULT_SIPZRTP_ATTRIBUTE,
-                Boolean.toString(registration.isSipZrtpAttribute()));
-
-        accountProperties.put(ProtocolProviderFactory.POLLING_PERIOD,
-                registration.getPollingPeriod());
-
-        accountProperties.put(ProtocolProviderFactory.SUBSCRIPTION_EXPIRATION,
-                registration.getSubscriptionExpiration());
-
-        accountProperties.put("KEEP_ALIVE_METHOD",
-                registration.getKeepAliveMethod());
-
-        accountProperties.put("KEEP_ALIVE_INTERVAL",
-            registration.getKeepAliveInterval());
-
-        if(isModification)
-        {
-            accountProperties.put(ProtocolProviderFactory.USER_ID, userName);
-            providerFactory.modifyAccount(  protocolProvider,
-                                            accountProperties);
-
-            this.isModification  = false;
-
-            return protocolProvider;
-        }
-
-        try
-        {
-            AccountID accountID = providerFactory.installAccount(
-                    userName, accountProperties);
-
-            ServiceReference serRef = providerFactory
-                .getProviderForAccount(accountID);
-
-            protocolProvider
-                = (ProtocolProviderService) IptelAccRegWizzActivator
-                    .bundleContext.getService(serRef);
-        }
-        catch (IllegalStateException exc)
-        {
-            logger.warn(exc.getMessage());
-
-            throw new OperationFailedException(
-                "Account already exists.",
-                OperationFailedException.IDENTIFICATION_CONFLICT);
-        }
-        catch (Exception exc)
-        {
-            exc.printStackTrace();
-
-            throw new OperationFailedException(
-                exc.getMessage(),
-                OperationFailedException.GENERAL_ERROR);
-        }
-
-        return protocolProvider;
-    }
-
-    /**
-     * Fills the id and Password fields in this panel with the data coming
-     * from the given protocolProvider.
-     * @param protocolProvider The <tt>ProtocolProviderService</tt> to load the
-     * data from.
-     */
-    public void loadAccount(ProtocolProviderService protocolProvider)
-    {
-        this.isModification = true;
-
-        this.protocolProvider = protocolProvider;
-
-        this.registration = new IptelAccountRegistration();
-
-        this.firstWizardPage.loadAccount(protocolProvider);
-    }
-
-    /**
-     * Indicates if this wizard is opened for modification or for creating a
-     * new account.
-     *
-     * @return <code>true</code> if this wizard is opened for modification and
-     * <code>false</code> otherwise.
-     */
-    public boolean isModification()
-    {
-        return isModification;
-    }
-
-    /**
-     * Returns the wizard container, where all pages are added.
-     *
-     * @return the wizard container, where all pages are added
-     */
-    public WizardContainer getWizardContainer()
-    {
-        return wizardContainer;
-    }
-
-    /**
-     * Returns the registration object, which will store all the data through
-     * the wizard.
-     *
-     * @return the registration object, which will store all the data through
-     * the wizard
-     */
-    public IptelAccountRegistration getRegistration()
-    {
-        return registration;
-    }
-
-    /**
-     * Returns the size of this wizard.
-     * @return the size of this wizard
-     */
-    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();
-    }
-
-    /**
-     * Sets the modification property to indicate if this wizard is opened for
-     * a modification.
-     *
-     * @param isModification indicates if this wizard is opened for modification
-     * or for creating a new account.
-     */
-    public void setModification(boolean isModification)
-    {
-        this.isModification = isModification;
+        return Resources.getString(
+            "plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION");
     }
 
     /**
@@ -511,63 +99,53 @@ public void setModification(boolean isModification)
      */
     public String getUserNameExample()
     {
-        return FirstWizardPage.USER_NAME_EXAMPLE;
+        return "Ex: myusername or myusername@iptel.org";
     }
 
     /**
-     * Enables the simple "Sign in" form.
-     * @return <tt>true</tt> if the simple form is enabled, otherwise returns
-     * <tt>false</tt>
+     * Returns the protocol name as listed in "ProtocolNames" or just the name
+     * of the service.
+     * @return the protocol name
      */
-    public boolean isSimpleFormEnabled()
+    public String getProtocol()
     {
-        return true;
+        return PROTOCOL;
     }
 
     /**
-     * Return the server part of the sip user name.
-     *
-     * @param userName the user name entered by the user
-     * @return the server part of the sip user name.
+     * Returns the protocol icon path.
+     * @return the protocol icon path
      */
-    protected String getServerFromUserName(String userName)
+    public String getProtocolIconPath()
     {
-        int delimIndex = userName.indexOf("@");
-        if (delimIndex != -1)
-        {
-            return userName.substring(delimIndex + 1);
-        }
-
-        return null;
+        return "resources/images/protocol/iptel";
     }
 
     /**
-     * Opens the browser on the page sign up
+     * Returns the account icon path.
+     * @return the account icon path
      */
-    public void webSignup()
+    public String getAccountIconPath()
     {
-        IptelAccRegWizzActivator.getBrowserLauncher()
-            .openURL("https://serweb.iptel.org/user/reg/index.php");
+        return "resources/images/protocol/iptel/sip32x32.png";
     }
 
     /**
-     * Returns <code>true</code> if the web sign up is supported by the current
-     * implementation, <code>false</code> - otherwise.
-     * @return <code>true</code> if the web sign up is supported by the current
-     * implementation, <code>false</code> - otherwise
+     * Opens the browser on the page sign up
      */
-    public boolean isWebSignupSupported()
+    public void webSignup()
     {
-        return true;
+        IptelAccRegWizzActivator.getBrowserLauncher()
+            .openURL("https://serweb.iptel.org/user/reg/index.php");
     }
 
     /**
-     * Returns the simple form used in the simple account wizard.
-     * @return the simple form used in the simple account wizard
+     * Returns the name of the web sign up link.
+     * @return the name of the web sign up link
      */
-    public Object getSimpleForm()
+    public String getWebSignupLinkName()
     {
-        firstWizardPage = new FirstWizardPage(this);
-        return firstWizardPage.getSimpleForm();
+        return IptelAccRegWizzActivator.getResources().getI18NString(
+            "plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE");
     }
 }
diff --git a/src/net/java/sip/communicator/plugin/iptelaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/iptelaccregwizz/Resources.java
deleted file mode 100644
index 3f50f740c..000000000
--- a/src/net/java/sip/communicator/plugin/iptelaccregwizz/Resources.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- * 
- * Distributable under LGPL license. See terms of license at gnu.org.
- */
-package net.java.sip.communicator.plugin.iptelaccregwizz;
-
-import net.java.sip.communicator.service.resources.*;
-
-/**
- * The <tt>Resources</tt> class manages the access to the internationalization
- * properties files and the image resources used in this plugin.
- *
- * @author Yana Stamcheva
- */
-public class Resources
-{
-    private static ResourceManagementService resourcesService;
-    
-    /**
-     * A constant pointing to the IP Tel protocol logo image.
-     */
-    public static final ImageID PROTOCOL_ICON
-        = new ImageID("service.protocol.iptel.IPTEL_16x16");
-
-    /**
-     * A constant pointing to the IP Tel protocol wizard page image.
-     */
-    public static final ImageID PAGE_IMAGE
-        = new ImageID("service.protocol.iptel.IPTEL_64x64");
-
-    /**
-     * Returns an internationalized string corresponding to the given key.
-     * 
-     * @param key The key of the string.
-     * @return An internationalized string corresponding to the given key.
-     */
-    public static String getString(String key)
-    {
-        return getResources().getI18NString(key);
-    }
-
-    /**
-     * Returns an internationalized string corresponding to the given key.
-     * 
-     * @param key The key of the string.
-     * @return An internationalized string corresponding to the given key.
-     */
-    public static char getMnemonic(String key)
-    {
-        return getResources().getI18nMnemonic(key);
-    }
-
-    /**
-     * Loads an image from a given image identifier.
-     * 
-     * @param imageID The identifier of the image.
-     * @return The image for the given identifier.
-     */
-    public static byte[] getImage(ImageID imageID)
-    {
-        return getResources().getImageInBytes(imageID.getId());
-    }
-
-    /**
-     * Returns the resource for the given key. This could be any resource stored
-     * in the resources.properties file of this bundle.
-     * 
-     * @param key the key of the resource to search for
-     * @return the resource for the given key
-     */
-    public static String getProperty(String key)
-    {
-        return getResources().getI18NString(key);
-    }
-
-    /**
-     * Returns the service giving access to resources.
-     * @return the service giving access to resources
-     */
-    public static ResourceManagementService getResources()
-    {
-        if (resourcesService == null)
-            resourcesService = ResourceManagementServiceUtils
-                .getService(IptelAccRegWizzActivator.bundleContext);
-        return resourcesService;
-    }
-}
diff --git a/src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf
index 5edbb6e64..3d98a28c4 100644
--- a/src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf
@@ -18,7 +18,8 @@ Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.protocol.icqconstants,
  net.java.sip.communicator.service.resources,
  net.java.sip.communicator.util,
- net.java.sip.communicator.util.swing,
+ net.java.sip.communicator.util.swing,
+ net.java.sip.communicator.plugin.sipaccregwizz,
  javax.naming,
  javax.naming.directory,
  javax.xml.parsers,
diff --git a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccRegWizzActivator.java
new file mode 100644
index 000000000..8ecc70c37
--- /dev/null
+++ b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccRegWizzActivator.java
@@ -0,0 +1,136 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.plugin.sip2sipaccregwizz;
+
+import java.util.*;
+
+import org.osgi.framework.*;
+
+import net.java.sip.communicator.service.browserlauncher.*;
+import net.java.sip.communicator.service.gui.*;
+import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.resources.*;
+import net.java.sip.communicator.util.*;
+
+/**
+ * Registers the <tt>GoogleTalkAccountRegistrationWizard</tt> in the UI Service.
+ *
+ * @author Lubomir Marinov
+ * @author Yana Stamcheva
+ */
+public class Sip2SipAccRegWizzActivator
+    implements BundleActivator
+{
+    public static BundleContext bundleContext;
+
+    private static final Logger logger = Logger.getLogger(
+        Sip2SipAccRegWizzActivator.class.getName());
+
+    private static BrowserLauncherService browserLauncherService;
+
+    private static ResourceManagementService resourcesService;
+
+    private static UIService uiService;
+
+    /**
+     * Starts this bundle.
+     * @param bc BundleContext
+     * @throws Exception
+     */
+    public void start(BundleContext bc)
+        throws Exception
+    {
+        bundleContext = bc;
+
+        uiService =
+            (UIService) bundleContext.getService(bundleContext
+                .getServiceReference(UIService.class.getName()));
+
+        Sip2SipAccountRegistrationWizard wizard
+            = new Sip2SipAccountRegistrationWizard(uiService
+                .getAccountRegWizardContainer());
+
+        Hashtable<String, String> containerFilter
+            = new Hashtable<String, String>();
+        containerFilter.put(
+                ProtocolProviderFactory.PROTOCOL,
+                Sip2SipAccountRegistrationWizard.PROTOCOL);
+
+        bundleContext.registerService(
+            AccountRegistrationWizard.class.getName(),
+            wizard,
+            containerFilter);
+    }
+
+    public void stop(BundleContext bundleContext) throws Exception {}
+
+    /**
+     * Returns the <tt>ProtocolProviderFactory</tt> for the IP Tel protocol.
+     * 
+     * @return the <tt>ProtocolProviderFactory</tt> for the IP Tel protocol
+     */
+    public static ProtocolProviderFactory getIptelProtocolProviderFactory()
+    {
+        ServiceReference[] serRefs = null;
+
+        String osgiFilter = "("
+            + ProtocolProviderFactory.PROTOCOL
+            + "=" + ProtocolNames.SIP + ")";
+
+        try
+        {
+            serRefs = bundleContext.getServiceReferences(
+                ProtocolProviderFactory.class.getName(), osgiFilter);
+        }
+        catch (InvalidSyntaxException ex)
+        {
+            logger.error("IptelAccRegWizzActivator : " + ex);
+        }
+
+        return (ProtocolProviderFactory) bundleContext.getService(serRefs[0]);
+    }
+
+    /**
+     * Returns the <tt>UIService</tt>.
+     * 
+     * @return the <tt>UIService</tt>
+     */
+    public static UIService getUIService()
+    {
+        return uiService;
+    }
+
+    /**
+     * Returns the <tt>BrowserLauncherService</tt> obtained from the bundle
+     * context.
+     * @return the <tt>BrowserLauncherService</tt> obtained from the bundle
+     * context
+     */
+    public static BrowserLauncherService getBrowserLauncher()
+    {
+        if (browserLauncherService == null)
+        {
+            browserLauncherService
+                = (BrowserLauncherService) bundleContext.getService(
+                    bundleContext.getServiceReference(
+                        BrowserLauncherService.class.getName()));
+        }
+        return browserLauncherService;
+    }
+
+    /**
+     * Returns the service giving access to resources.
+     * @return the service giving access to resources
+     */
+    public static ResourceManagementService getResources()
+    {
+        if (resourcesService == null)
+            resourcesService = ResourceManagementServiceUtils
+                .getService(Sip2SipAccRegWizzActivator.bundleContext);
+        return resourcesService;
+    }
+}
diff --git a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java
new file mode 100644
index 000000000..096e79e1d
--- /dev/null
+++ b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java
@@ -0,0 +1,150 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.plugin.sip2sipaccregwizz;
+
+import net.java.sip.communicator.plugin.sipaccregwizz.*;
+import net.java.sip.communicator.service.gui.*;
+
+/**
+ * The <tt>Sip2SipAccountRegistrationWizard</tt> is an implementation of the
+ * <tt>AccountRegistrationWizard</tt> for the SIP protocol. It should allow
+ * the user to create and configure a new IP Tel SIP account.
+ *
+ * @author Yana Stamcheva
+ */
+public class Sip2SipAccountRegistrationWizard
+    extends SIPAccountRegistrationWizard
+{
+    /**
+     * A constant pointing to the IP Tel protocol logo image.
+     */
+    private static final String PROTOCOL_ICON
+        = "service.protocol.sip2sip.SIP2SIP_16x16";
+
+    /**
+     * A constant pointing to the IP Tel protocol wizard page image.
+     */
+    private static final String PAGE_IMAGE
+        = "service.protocol.sip2sip.SIP2SIP_64x64";
+
+    /**
+     * The protocol name.
+     */
+    public static final String PROTOCOL = "sip2sip.info";
+
+    /**
+     * Creates an instance of <tt>IptelAccountRegistrationWizard</tt>.
+     * @param wizardContainer the wizard container
+     */
+    public Sip2SipAccountRegistrationWizard(WizardContainer wizardContainer)
+    {
+        super(wizardContainer);
+    }
+
+    /**
+     * Implements the <code>AccountRegistrationWizard.getIcon</code> method.
+     * Returns the icon to be used for this wizard.
+     * @return byte[]
+     */
+    public byte[] getIcon()
+    {
+        return Sip2SipAccRegWizzActivator.getResources()
+            .getImageInBytes(PROTOCOL_ICON);
+    }
+
+    /**
+     * Implements the <code>AccountRegistrationWizard.getPageImage</code> method.
+     * Returns the image used to decorate the wizard page
+     *
+     * @return byte[] the image used to decorate the wizard page
+     */
+    public byte[] getPageImage()
+    {
+        return Sip2SipAccRegWizzActivator.getResources()
+            .getImageInBytes(PAGE_IMAGE);
+    }
+
+
+    /**
+     * Implements the <code>AccountRegistrationWizard.getProtocolName</code>
+     * method. Returns the protocol name for this wizard.
+     * @return String
+     */
+    public String getProtocolName()
+    {
+        return Resources.getString(
+            "plugin.sip2sipaccregwizz.PROTOCOL_NAME");
+    }
+
+    /**
+     * Implements the <code>AccountRegistrationWizard.getProtocolDescription
+     * </code> method. Returns the description of the protocol for this wizard.
+     * @return String
+     */
+    public String getProtocolDescription()
+    {
+        return Resources.getString(
+            "plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION");
+    }
+
+    /**
+     * Returns an example string, which should indicate to the user how the
+     * user name should look like.
+     * @return an example string, which should indicate to the user how the
+     * user name should look like.
+     */
+    public String getUserNameExample()
+    {
+        return "Ex: myusername or myusername@sip2sip.info";
+    }
+
+    /**
+     * Returns the protocol name as listed in "ProtocolNames" or just the name
+     * of the service.
+     * @return the protocol name
+     */
+    public String getProtocol()
+    {
+        return PROTOCOL;
+    }
+
+    /**
+     * Returns the protocol icon path.
+     * @return the protocol icon path
+     */
+    public String getProtocolIconPath()
+    {
+        return "resources/images/protocol/sip2sip";
+    }
+
+    /**
+     * Returns the account icon path.
+     * @return the account icon path
+     */
+    public String getAccountIconPath()
+    {
+        return "resources/images/protocol/sip2sip/sip32x32.png";
+    }
+
+    /**
+     * Opens the browser on the page sign up
+     */
+    public void webSignup()
+    {
+        Sip2SipAccRegWizzActivator.getBrowserLauncher()
+            .openURL("https://secure.dns-hosting.info/register_sip_account.phtml");
+    }
+
+    /**
+     * Returns the name of the web sign up link.
+     * @return the name of the web sign up link
+     */
+    public String getWebSignupLinkName()
+    {
+        return Resources.getString("plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE");
+    }
+}
diff --git a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf
new file mode 100644
index 000000000..a86ed131b
--- /dev/null
+++ b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf
@@ -0,0 +1,42 @@
+Bundle-Activator: net.java.sip.communicator.plugin.sip2sipaccregwizz.Sip2SipAccRegWizzActivator
+Bundle-Name: Sip 2 Sip account registration wizard
+Bundle-Description: Sip 2 Sip account registration wizard.
+Bundle-Vendor: sip-communicator.org
+Bundle-Version: 0.0.1
+System-Bundle: yes
+Import-Package: org.osgi.framework,
+ net.java.sip.communicator.service.browserlauncher,
+ net.java.sip.communicator.service.configuration,
+ net.java.sip.communicator.service.configuration.event,
+ net.java.sip.communicator.service.contactlist,
+ net.java.sip.communicator.service.contactlist.event,
+ net.java.sip.communicator.service.fileaccess,
+ net.java.sip.communicator.service.gui,
+ net.java.sip.communicator.service.gui.event,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.protocol.icqconstants,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
+ net.java.sip.communicator.plugin.sipaccregwizz,
+ javax.naming,
+ javax.naming.directory,
+ javax.xml.parsers,
+ org.w3c.dom,
+ org.xml.sax,
+ javax.swing,
+ javax.swing.event,
+ javax.swing.table,
+ javax.swing.text,
+ javax.swing.text.html,
+ javax.accessibility,
+ javax.swing.plaf,
+ javax.swing.plaf.metal,
+ javax.swing.plaf.basic,
+ javax.imageio,
+ javax.swing.filechooser,
+ javax.swing.tree,
+ javax.swing.undo,
+ javax.swing.border,
+ org.jivesoftware.smack
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/AccountPanel.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/AccountPanel.java
new file mode 100644
index 000000000..a5c79bb66
--- /dev/null
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/AccountPanel.java
@@ -0,0 +1,271 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license. See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.plugin.sipaccregwizz;
+
+import java.awt.*;
+import java.awt.event.*;
+
+import javax.swing.*;
+import javax.swing.event.*;
+
+import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
+
+/**
+ * The panel containing all account related information like user name and
+ * password.
+ *
+ * @author Yana Stamcheva
+ */
+public class AccountPanel
+    extends TransparentPanel
+    implements DocumentListener
+{
+    private final Logger logger = Logger.getLogger(AccountPanel.class);
+
+    private final JPanel labelsPanel
+        = new TransparentPanel(new GridLayout(0, 1));
+
+    private JPanel valuesPanel = new TransparentPanel(new GridLayout(0, 1));
+
+    private JPanel emptyPanel = new TransparentPanel();
+
+    private JTextField userIDField = new JTextField();
+
+    private JPasswordField passField = new JPasswordField();
+
+    private final JTextField displayNameField = new JTextField();
+
+    private JCheckBox rememberPassBox
+        = new SIPCommCheckBox(
+            Resources.getString("service.gui.REMEMBER_PASSWORD"));
+
+    private final JLabel displayNameLabel
+        = new JLabel(Resources.getString("plugin.sipaccregwizz.DISPLAY_NAME"));
+
+    private final SIPAccountRegistrationForm regform;
+
+    /**
+     * Creates an instance of the <tt>AccountPanel</tt>.
+     * @param regform the parent registration form
+     */
+    public AccountPanel(SIPAccountRegistrationForm regform)
+    {
+        super (new BorderLayout());
+
+        this.regform = regform;
+
+        this.userIDField.getDocument().addDocumentListener(this);
+
+        this.rememberPassBox.setSelected(true);
+
+        JLabel uinExampleLabel = new JLabel(regform.getUsernameExample());
+        uinExampleLabel.setForeground(Color.GRAY);
+        uinExampleLabel.setFont(uinExampleLabel.getFont().deriveFont(8));
+        emptyPanel.setMaximumSize(new Dimension(40, 35));
+        uinExampleLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 8, 0));
+
+        JPanel uinPassPanel
+            = new TransparentPanel(new BorderLayout(10, 10));
+
+        JLabel uinLabel
+            = new JLabel(Resources.getString("plugin.sipaccregwizz.USERNAME"));
+
+        JLabel passLabel
+            = new JLabel(Resources.getString("service.gui.PASSWORD"));
+
+        labelsPanel.add(uinLabel);
+        labelsPanel.add(emptyPanel);
+        labelsPanel.add(passLabel);
+
+        valuesPanel.add(userIDField);
+        valuesPanel.add(uinExampleLabel);
+        valuesPanel.add(passField);
+
+        TransparentPanel southPanel
+            = new TransparentPanel(new GridLayout(1, 2));
+
+        uinPassPanel.add(labelsPanel, BorderLayout.WEST);
+        uinPassPanel.add(valuesPanel, BorderLayout.CENTER);
+        uinPassPanel.add(southPanel, BorderLayout.SOUTH);
+
+        southPanel.add(rememberPassBox);
+
+        String webSignup = regform.getWebSignupLinkName();
+        if (webSignup != null)
+        {
+            southPanel.add(createSubscribeLabel(webSignup));
+        }
+
+        uinPassPanel.setBorder(BorderFactory.createTitledBorder(Resources
+            .getString("plugin.sipaccregwizz.USERNAME_AND_PASSWORD")));
+
+        this.add(uinPassPanel, BorderLayout.NORTH);
+    }
+
+    /**
+     * Initializes the advanced account panel.
+     */
+    void initAdvancedForm()
+    {
+        // If it's not yet added.
+        if (displayNameLabel.getParent() == null)
+            labelsPanel.add(displayNameLabel);
+
+        // If it's not yet added.
+        if (displayNameField.getParent() == null)
+            valuesPanel.add(displayNameField);
+    }
+
+    /**
+     * Handles the <tt>DocumentEvent</tt> triggered when user types in the UIN
+     * field. Enables or disables the "Next" wizard button according to whether
+     * the UIN field is empty.
+     * @param e the <tt>DocumentEvent</tt> that notified us
+     */
+    public void insertUpdate(DocumentEvent e)
+    {
+        regform.setNextFinishButtonEnabled(userIDField.getText() == null
+                                            || userIDField.getText().equals(""));
+        regform.setServerFieldAccordingToUIN(userIDField.getText());
+    }
+
+    /**
+     * Handles the <tt>DocumentEvent</tt> triggered when user deletes letters
+     * from the UIN field. Enables or disables the "Next" wizard button
+     * according to whether the UIN field is empty.
+     * @param e the <tt>DocumentEvent</tt> that notified us
+     */
+    public void removeUpdate(DocumentEvent e)
+    {
+        regform.setNextFinishButtonEnabled(userIDField.getText() == null
+                                            || userIDField.getText().equals(""));
+        regform.setServerFieldAccordingToUIN(userIDField.getText());
+    }
+
+    public void changedUpdate(DocumentEvent e) {}
+
+    /**
+     * Returns the user identifier entered by the user.
+     * @return the user identifier
+     */
+    String getUserID()
+    {
+        return userIDField.getText();
+    }
+
+    /**
+     * Returns the password entered by the user.
+     * @return the password
+     */
+    char[] getPassword()
+    {
+        return passField.getPassword();
+    }
+
+    /**
+     * Indicates if the "remember password" check box is selected.
+     * @return <tt>true</tt> if the "remember password" check box is selected,
+     * otherwise returns <tt>false</tt>
+     */
+    boolean isRememberPassword()
+    {
+        return rememberPassBox.isSelected();
+    }
+
+    /**
+     * Returns the display name of the account.
+     * @return the display name of the account
+     */
+    String getDisplayName()
+    {
+        return displayNameField.getText();
+    }
+
+    /**
+     * Sets the display name of the account.
+     * @param displayName the display name of the account
+     */
+    void setDisplayName(String displayName)
+    {
+        displayNameField.setText(displayName);
+    }
+
+    /**
+     * Enables/disables the user id text field.
+     * @param isEnabled <tt>true</tt> to enable the user id text field,
+     * <tt>false</tt> - otherwise
+     */
+    void setUserIDEnabled(boolean isEnabled)
+    {
+        userIDField.setEnabled(isEnabled);
+    }
+
+    /**
+     * Sets the user id.
+     * @param userID the user id to set
+     */
+    void setUserID(String userID)
+    {
+        userIDField.setText(userID);
+    }
+
+    /**
+     * Sets the password
+     * @param password the password
+     */
+    void setPassword(String password)
+    {
+        this.passField.setText(password);
+    }
+
+    /**
+     * Sets the password remember check box.
+     * @param isRememberPassword <tt>true</tt> to select the remember password
+     * check box, <tt>false</tt> - otherwise
+     */
+    void setRememberPassword(boolean isRememberPassword)
+    {
+        rememberPassBox.setSelected(isRememberPassword);
+    }
+
+    /**
+     * Creates the subscribe label.
+     * @param linkName the link name
+     * @return the newly created subscribe label
+     */
+    private Component createSubscribeLabel(String linkName)
+    {
+        JLabel subscribeLabel =
+            new JLabel("<html><a href=''>"
+                + linkName
+                + "</a></html>",
+                JLabel.RIGHT);
+
+        subscribeLabel.setCursor(new Cursor(Cursor.HAND_CURSOR));
+        subscribeLabel.setToolTipText(
+            Resources.getString("plugin.simpleaccregwizz.SPECIAL_SIGNUP"));
+        subscribeLabel.addMouseListener(new MouseAdapter()
+        {
+            public void mousePressed(MouseEvent e)
+            {
+                try
+                {
+                    regform.webSignup();
+                }
+                catch (UnsupportedOperationException ex)
+                {
+                    // This should not happen, because we check if the
+                    // operation is supported, before adding the sign
+                    // up.
+                    logger.error("The web sign up is not supported.",
+                        ex);
+                }
+            }
+        });
+        return subscribeLabel;
+    }
+}
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java
new file mode 100644
index 000000000..f4f4cba32
--- /dev/null
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java
@@ -0,0 +1,453 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license. See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.plugin.sipaccregwizz;
+
+import java.awt.*;
+import java.awt.event.*;
+
+import javax.swing.*;
+
+import net.java.sip.communicator.service.gui.*;
+import net.java.sip.communicator.util.swing.*;
+
+/**
+ * The panel containing information about the connection.
+ *
+ * @author Yana Stamcheva
+ */
+public class ConnectionPanel
+    extends TransparentPanel
+    implements ItemListener
+{
+    private final JCheckBox enableDefaultEncryption =
+        new SIPCommCheckBox(Resources
+            .getString("plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION"), true);
+
+    private final JCheckBox enableSipZrtpAttribute =
+        new SIPCommCheckBox(Resources
+            .getString("plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE"), true);
+
+    private final JTextField serverField = new JTextField();
+
+    private final JTextField proxyField = new JTextField();
+
+    private final JTextField authNameField = new JTextField();
+
+    private final JTextField serverPortField
+        = new JTextField(SIPAccountRegistration.DEFAULT_PORT);
+
+    private final JTextField proxyPortField
+        = new JTextField(SIPAccountRegistration.DEFAULT_PORT);
+
+    private JComboBox transportCombo = new JComboBox(new Object[]
+    { "UDP", "TCP", "TLS" });
+
+    private JComboBox keepAliveMethodBox
+        = new JComboBox(new Object []
+                                {
+                                    "REGISTER",
+                                    "OPTIONS"
+                                });
+
+    private JTextField keepAliveIntervalValue = new JTextField();
+
+    private boolean isServerOverridden = false;
+
+    private SIPAccountRegistrationForm regform;
+
+    /**
+     * Creates an instance of the <tt>ConnectionPanel</tt>.
+     * @param regform the parent registration form
+     */
+    public ConnectionPanel(SIPAccountRegistrationForm regform)
+    {
+        super(new BorderLayout());
+
+        this.regform = regform;
+
+        this.transportCombo.addItemListener(this);
+
+        transportCombo.setSelectedItem(
+            SIPAccountRegistration.DEFAULT_TRANSPORT);
+
+        JPanel mainPanel = new TransparentPanel(new BorderLayout(10, 10));
+
+        JPanel labelsPanel
+            = new TransparentPanel(new GridLayout(0, 1, 10, 10));
+
+        JPanel valuesPanel
+            = new TransparentPanel(new GridLayout(0, 1, 10, 10));
+
+        JLabel serverLabel
+            = new JLabel(Resources.getString("plugin.sipaccregwizz.REGISTRAR"));
+
+        JLabel proxyLabel
+            = new JLabel(Resources.getString("plugin.sipaccregwizz.PROXY"));
+
+        JLabel authNameLabel
+            = new JLabel(Resources.getString(
+                "plugin.sipaccregwizz.AUTH_NAME"));
+
+        JLabel serverPortLabel
+            = new JLabel(Resources.getString(
+                "plugin.sipaccregwizz.SERVER_PORT"));
+
+        JLabel proxyPortLabel
+            = new JLabel(Resources.getString(
+                "plugin.sipaccregwizz.PROXY_PORT"));
+
+        JLabel transportLabel
+            = new JLabel(Resources.getString(
+                "plugin.sipaccregwizz.PREFERRED_TRANSPORT"));
+
+        labelsPanel.add(serverLabel);
+        labelsPanel.add(authNameLabel);
+        labelsPanel.add(serverPortLabel);
+        labelsPanel.add(proxyLabel);
+        labelsPanel.add(proxyPortLabel);
+        labelsPanel.add(transportLabel);
+
+        valuesPanel.add(serverField);
+        valuesPanel.add(authNameField);
+        valuesPanel.add(serverPortField);
+        valuesPanel.add(proxyField);
+        valuesPanel.add(proxyPortField);
+        valuesPanel.add(transportCombo);
+
+        mainPanel.add(labelsPanel, BorderLayout.WEST);
+        mainPanel.add(valuesPanel, BorderLayout.CENTER);
+
+        JPanel encryptionPanel
+            = new TransparentPanel(new GridLayout(1, 2, 2, 2));
+
+        encryptionPanel.add(enableDefaultEncryption, BorderLayout.WEST);
+        encryptionPanel.add(enableSipZrtpAttribute, BorderLayout.EAST);
+
+        enableDefaultEncryption.addActionListener(new ActionListener()
+        {
+            public void actionPerformed(ActionEvent evt)
+            {
+                // Perform action
+                JCheckBox cb = (JCheckBox) evt.getSource();
+
+                enableSipZrtpAttribute.setEnabled(cb.isSelected());
+            }
+        });
+
+        mainPanel.add(encryptionPanel, BorderLayout.SOUTH);
+
+        mainPanel.setBorder(BorderFactory.createTitledBorder(Resources
+            .getString("plugin.sipaccregwizz.ADVANCED_OPTIONS")));
+
+        this.add(mainPanel, BorderLayout.NORTH);
+        this.add(createKeepAlivePanel(), BorderLayout.SOUTH);
+    }
+
+    /**
+     * Parse the server part from the sip id and set it to server as default
+     * value. If Advanced option is enabled Do nothing.
+     * @param serverAddress the address of the server
+     */
+    public void setServerFieldAccordingToUIN(String serverAddress)
+    {
+        if (!regform.isModification() || !isServerOverridden)
+        {
+            serverField.setText(serverAddress);
+            proxyField.setText(serverAddress);
+        }
+    }
+
+    /**
+     * Indicates that the state of the item has changed.
+     * @param e the <tt>ItemEvent</tt> that notified us
+     */
+    public void itemStateChanged(ItemEvent e)
+    {
+        if (e.getStateChange() == ItemEvent.SELECTED
+            && e.getItem().equals("TLS"))
+        {
+            serverPortField.setText(SIPAccountRegistration.DEFAULT_TLS_PORT);
+            proxyPortField.setText(SIPAccountRegistration.DEFAULT_TLS_PORT);
+        }
+        else
+        {
+            serverPortField.setText(SIPAccountRegistration.DEFAULT_PORT);
+            proxyPortField.setText(SIPAccountRegistration.DEFAULT_PORT);
+        }
+    }
+
+    /**
+     * Creates the keep alive panel.
+     * @return the created keep alive panel
+     */
+    private Component createKeepAlivePanel()
+    {
+        JPanel emptyLabelPanel = new TransparentPanel();
+        emptyLabelPanel.setMaximumSize(new Dimension(40, 35));
+
+        JPanel keepAlivePanel
+            = new TransparentPanel(new BorderLayout(10, 10));
+
+        JPanel keepAliveLabels
+            = new TransparentPanel(new GridLayout(0, 1, 5, 5));
+
+        JPanel keepAliveValues
+            = new TransparentPanel(new GridLayout(0, 1, 5, 5));
+
+        JLabel keepAliveMethodLabel = new JLabel(
+            Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_METHOD"));
+
+        JLabel keepAliveIntervalLabel = new JLabel(
+            Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL"));
+
+        JLabel keepAliveIntervalExampleLabel = new JLabel(
+            Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO"));
+
+        keepAliveLabels.add(keepAliveMethodLabel);
+        keepAliveLabels.add(keepAliveIntervalLabel);
+        keepAliveLabels.add(emptyLabelPanel);
+
+        keepAliveIntervalExampleLabel.setForeground(Color.GRAY);
+        keepAliveIntervalExampleLabel
+            .setFont(keepAliveIntervalExampleLabel.getFont().deriveFont(8));
+        keepAliveIntervalExampleLabel
+            .setMaximumSize(new Dimension(40, 35));
+        keepAliveIntervalExampleLabel
+            .setBorder(BorderFactory.createEmptyBorder(0, 0, 8, 0));
+
+        keepAliveIntervalValue
+            .setText(SIPAccountRegistration.DEFAULT_KEEP_ALIVE_INTERVAL);
+
+        keepAliveMethodBox.setSelectedItem(
+            SIPAccountRegistration.DEFAULT_KEEP_ALIVE_METHOD);
+
+        keepAliveValues.add(keepAliveMethodBox);
+        keepAliveValues.add(keepAliveIntervalValue);
+        keepAliveValues.add(keepAliveIntervalExampleLabel);
+
+        keepAlivePanel.add(keepAliveLabels, BorderLayout.WEST);
+        keepAlivePanel.add(keepAliveValues, BorderLayout.CENTER);
+
+        keepAlivePanel.setBorder(BorderFactory.createTitledBorder(
+            Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE")));
+
+        return keepAlivePanel;
+    }
+
+    /**
+     * Returns the server address.
+     * @return the server address
+     */
+    String getServerAddress()
+    {
+        return serverField.getText();
+    }
+
+    /**
+     * Sets the server address.
+     * @param serverAddress the server address
+     */
+    void setServerAddress(String serverAddress)
+    {
+        serverField.setText(serverAddress);
+    }
+
+    /**
+     * Enables/disables the server text field.
+     * @param isEnabled <tt>true</tt> to enable the server text field,
+     * <tt>false</tt> - otherwise
+     */
+    void setServerEnabled(boolean isEnabled)
+    {
+        serverField.setEnabled(isEnabled);
+    }
+
+    /**
+     * Returns the authentication name.
+     * @return the authentication name
+     */
+    String getAuthenticationName()
+    {
+        return authNameField.getText();
+    }
+
+    /**
+     * Sets the authentication name.
+     * @param authName the authentication name
+     */
+    void setAuthenticationName(String authName)
+    {
+        authNameField.setText(authName);
+    }
+
+    /**
+     * Returns the server port.
+     * @return the server port
+     */
+    String getServerPort()
+    {
+        return serverPortField.getText();
+    }
+
+    /**
+     * Sets the server port.
+     * @param serverPort the server port
+     */
+    void setServerPort(String serverPort)
+    {
+        serverPortField.setText(serverPort);
+    }
+
+    /**
+     * Returns the proxy.
+     * @return the proxy
+     */
+    String getProxy()
+    {
+        return proxyField.getText();
+    }
+
+    /**
+     * Sets the proxy address.
+     * @param proxyAddress the proxy address
+     */
+    void setProxy(String proxyAddress)
+    {
+        proxyField.setText(proxyAddress);
+    }
+
+    /**
+     * Return the proxy port.
+     * @return the proxy port
+     */
+    String getProxyPort()
+    {
+        return proxyPortField.getText();
+    }
+
+    /**
+     * Sets the proxy port.
+     * @param proxyPort the proxy port
+     */
+    void setProxyPort(String proxyPort)
+    {
+        proxyPortField.setText(proxyPort);
+    }
+
+    /**
+     * Returns the selected transport.
+     * @return the selected transport
+     */
+    String getSelectedTransport()
+    {
+        //Emil: it appears that sometimes the selected item may be null even
+        //though the combo box does not allow a null selection.
+        Object selectedItem = transportCombo.getSelectedItem();
+
+        if(selectedItem == null)
+            selectedItem = transportCombo.getItemAt(0);
+
+        return selectedItem.toString();
+    }
+
+    /**
+     * Sets the selected transport.
+     * @param preferredTransport the transport to select
+     */
+    void setSelectedTransport(String preferredTransport)
+    {
+        transportCombo.setSelectedItem(preferredTransport);
+    }
+
+    /**
+     * Indicates if the default encryption is enabled.
+     * @return <tt>true</tt> if the default encryption is enabled,
+     * <tt>false</tt> - otherwise
+     */
+    boolean isDefaultEncryptionEnabled()
+    {
+        return enableDefaultEncryption.isSelected();
+    }
+
+    /**
+     * Enables/disables the default encryption.
+     * @param isEnable <tt>true</tt> to enable the default encryption,
+     * <tt>false</tt> - otherwise
+     */
+    void enablesDefaultEncryption(boolean isEnable)
+    {
+        enableDefaultEncryption.setSelected(isEnable);
+    }
+
+    /**
+     * Indicates if the ZRTP encryption is enabled.
+     * @return <tt>true</tt> if <tt>ZRTP</tt> is enabled, <tt>false</tt> -
+     * otherwise
+     */
+    boolean isSipZrtpEnabled()
+    {
+        return enableSipZrtpAttribute.isSelected();
+    }
+
+    /**
+     * Enables/disables and selects/deselects the sip zrtp checkbox.
+     * @param isSipZrtpEnabled indicates if the sip zrtp is enabled
+     * @param isDefaultEncryptionEnabled indicates if the default encryption is
+     * enabled
+     */
+    void setSipZrtpEnabled( boolean isSipZrtpEnabled,
+                            boolean isDefaultEncryptionEnabled)
+    {
+        enableSipZrtpAttribute.setSelected(isSipZrtpEnabled);
+        enableSipZrtpAttribute.setEnabled(isDefaultEncryptionEnabled);
+    }
+
+    /**
+     * Returns the keep alive method.
+     * @return the keep alive method
+     */
+    String getKeepAliveMethod()
+    {
+        return keepAliveMethodBox.getSelectedItem().toString();
+    }
+
+    /**
+     * Sets the keep alive method.
+     * @param keepAliveMethod the keep alive method
+     */
+    void setKeepAliveMethod(String keepAliveMethod)
+    {
+        keepAliveMethodBox.setSelectedItem(keepAliveMethod);
+    }
+
+    /**
+     * Returns the keep alive interval
+     * @return the keep alive interval
+     */
+    String getKeepAliveInterval()
+    {
+        return keepAliveIntervalValue.getText();
+    }
+
+    /**
+     * Sets the keep alive interval
+     * @param keepAliveInterval the keep alive interval
+     */
+    void setKeepAliveInterval(String keepAliveInterval)
+    {
+        keepAliveIntervalValue.setText(keepAliveInterval);
+    }
+
+    /**
+     * Sets the <tt>serverOverridden</tt> property.
+     * @param isServerOverridden <tt>true</tt> to indicate that the server is
+     * overridden, <tt>false</tt> - otherwise
+     */
+    void setServerOverridden(boolean isServerOverridden)
+    {
+        this.isServerOverridden = isServerOverridden;
+    }
+}
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
index dd1728f5f..e0b5cd944 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
@@ -6,9 +6,6 @@
 package net.java.sip.communicator.plugin.sipaccregwizz;
 
 import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
 
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -24,165 +21,17 @@
 @SuppressWarnings("serial")
 public class FirstWizardPage
     extends TransparentPanel
-    implements WizardPage, DocumentListener, ItemListener
+    implements WizardPage
 {
-    public static final String FIRST_PAGE_IDENTIFIER = "FirstPageIdentifier";
-
-    public static final String USER_NAME_EXAMPLE
-        = "Ex: john@voiphone.net or simply \"john\" for no server";
-
-    private JPanel firstTabPanel = new TransparentPanel(new BorderLayout());
-
-    private JPanel uinPassPanel = new TransparentPanel(new BorderLayout(10, 10));
-
-    private JPanel labelsPanel = new TransparentPanel();
-
-    private JPanel valuesPanel = new TransparentPanel();
-
-    private JLabel uinLabel
-        = new JLabel(Resources.getString("plugin.sipaccregwizz.USERNAME"));
-
-    private JLabel passLabel
-        = new JLabel(Resources.getString("service.gui.PASSWORD"));
-
-    private JPanel emptyPanel = new TransparentPanel();
-
-    private JLabel uinExampleLabel = new JLabel(USER_NAME_EXAMPLE);
-
-    private JTextField userIDField = new JTextField();
-
-    private JPasswordField passField = new JPasswordField();
-
-    private JCheckBox rememberPassBox =
-        new SIPCommCheckBox(
-            Resources.getString("service.gui.REMEMBER_PASSWORD"));
-
-    private JPanel advancedOpPanel
-        = new TransparentPanel(new BorderLayout(10, 10));
-
-    private JPanel labelsAdvOpPanel
-        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
-
-    private JPanel valuesAdvOpPanel
-        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
-
-    private JLabel serverLabel
-        = new JLabel(Resources.getString("plugin.sipaccregwizz.REGISTRAR"));
-
-    private JCheckBox enableDefaultEncryption =
-        new SIPCommCheckBox(Resources
-            .getString("plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION"), true);
-
-    private JCheckBox enableSipZrtpAttribute =
-        new SIPCommCheckBox(Resources
-            .getString("plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE"), true);
-
-    private JLabel proxyLabel
-        = new JLabel(Resources.getString("plugin.sipaccregwizz.PROXY"));
-
-    private JLabel displayNameLabel =
-        new JLabel(Resources.getString("plugin.sipaccregwizz.DISPLAY_NAME"));
-
-    private JLabel authNameLabel =
-        new JLabel(Resources.getString("plugin.sipaccregwizz.AUTH_NAME"));
-
-    private JLabel serverPortLabel =
-        new JLabel(Resources.getString("plugin.sipaccregwizz.SERVER_PORT"));
-
-    private JLabel proxyPortLabel =
-        new JLabel(Resources.getString("plugin.sipaccregwizz.PROXY_PORT"));
-
-    private JLabel transportLabel =
-        new JLabel(Resources.getString(
-            "plugin.sipaccregwizz.PREFERRED_TRANSPORT"));
-
-    private JTextField serverField = new JTextField();
-
-    private JTextField proxyField = new JTextField();
-
-    private JTextField displayNameField = new JTextField();
-
-    private JTextField authNameField = new JTextField();
-
-    private JTextField serverPortField
-        = new JTextField(SIPAccountRegistration.DEFAULT_PORT);
-
-    private JTextField proxyPortField
-        = new JTextField(SIPAccountRegistration.DEFAULT_PORT);
-
-    private JComboBox transportCombo = new JComboBox(new Object[]
-    { "UDP", "TCP", "TLS" });
-
-    private JPanel presenceOpPanel = new TransparentPanel(new BorderLayout(10, 10));
-
-    private JPanel buttonsPresOpPanel =
-        new TransparentPanel(new GridLayout(0, 1, 10, 10));
-
-    private JPanel labelsPresOpPanel
-        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
-
-    private JPanel valuesPresOpPanel
-        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
-
-    private JCheckBox enablePresOpButton =
-        new SIPCommCheckBox(Resources
-            .getString("plugin.sipaccregwizz.ENABLE_PRESENCE"), true);
-
-    private JCheckBox forceP2PPresOpButton =
-        new SIPCommCheckBox(Resources
-            .getString("plugin.sipaccregwizz.FORCE_P2P_PRESENCE"), false);
-
-    private JLabel pollPeriodLabel = new JLabel(
-        Resources.getString(
-            "plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD"));
-
-    private JLabel subscribeExpiresLabel = new JLabel(
-        Resources.getString("plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION"));
-
-    private JTextField pollPeriodField
-        = new JTextField(SIPAccountRegistration.DEFAULT_POLL_PERIOD);
-
-    private JTextField subscribeExpiresField =
-        new JTextField(SIPAccountRegistration.DEFAULT_SUBSCRIBE_EXPIRES);
-
-    private JPanel keepAlivePanel
-        = new TransparentPanel(new BorderLayout(10, 10));
-
-    private JPanel keepAliveLabels
-        = new TransparentPanel(new GridLayout(0, 1, 5, 5));
-
-    private JPanel keepAliveValues
-        = new TransparentPanel(new GridLayout(0, 1, 5, 5));
-
-    private JLabel keepAliveMethodLabel = new JLabel(
-        Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_METHOD"));
-
-    private JLabel keepAliveIntervalLabel = new JLabel(
-        Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL"));
-
-    private JLabel keepAliveIntervalExampleLabel = new JLabel(
-        Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO"));
-
-    private JComboBox keepAliveMethodBox
-        = new JComboBox(new Object []
-                                    {
-                                        "REGISTER",
-                                        "OPTIONS"
-                                    });
-
-    private JTextField keepAliveIntervalValue = new JTextField();
-
-    private JTabbedPane tabbedPane = new SIPCommTabbedPane(false, false);
-
-    private JPanel advancedPanel = new TransparentPanel();
+    static final String FIRST_PAGE_IDENTIFIER = "FirstPageIdentifier";
 
     private Object nextPageIdentifier = WizardPage.SUMMARY_PAGE_IDENTIFIER;
 
     private SIPAccountRegistrationWizard wizard;
 
-    private boolean isCommitted = false;
+    private final SIPAccountRegistrationForm registrationForm;
 
-    private boolean isServerOverridden = false;
+    private boolean isCommitted = false;
 
     /**
      * Creates an instance of <tt>FirstWizardPage</tt>.
@@ -195,175 +44,15 @@ public FirstWizardPage(SIPAccountRegistrationWizard wizard)
 
         this.wizard = wizard;
 
-        advancedPanel.setLayout(new BoxLayout(advancedPanel, BoxLayout.Y_AXIS));
-
-        this.init();
-
-        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-
-        this.labelsPanel
-            .setLayout(new BoxLayout(labelsPanel, BoxLayout.Y_AXIS));
-
-        this.valuesPanel
-            .setLayout(new BoxLayout(valuesPanel, BoxLayout.Y_AXIS));
-    }
-
-    /**
-     * Initializes all panels, buttons, etc.
-     */
-    private void init()
-    {
-        this.labelsPanel.setOpaque(false);
-        this.valuesPanel.setOpaque(false);
-        this.uinPassPanel.setOpaque(false);
-        this.emptyPanel.setOpaque(false);
-
-        this.userIDField.getDocument().addDocumentListener(this);
-        this.transportCombo.addItemListener(this);
-        this.rememberPassBox.setSelected(true);
-
-        this.uinExampleLabel.setForeground(Color.GRAY);
-        this.uinExampleLabel.setFont(uinExampleLabel.getFont().deriveFont(8));
-        this.emptyPanel.setMaximumSize(new Dimension(40, 35));
-        this.uinExampleLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 8,
-            0));
-
-        labelsPanel.add(uinLabel);
-        labelsPanel.add(emptyPanel);
-        labelsPanel.add(passLabel);
-
-        valuesPanel.add(userIDField);
-        valuesPanel.add(uinExampleLabel);
-        valuesPanel.add(passField);
-
-        uinPassPanel.add(labelsPanel, BorderLayout.WEST);
-        uinPassPanel.add(valuesPanel, BorderLayout.CENTER);
-        uinPassPanel.add(rememberPassBox, BorderLayout.SOUTH);
-
-        uinPassPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("plugin.sipaccregwizz.USERNAME_AND_PASSWORD")));
-
-        firstTabPanel.add(uinPassPanel, BorderLayout.NORTH);
-
-        tabbedPane.addTab(  Resources.getString("service.gui.SUMMARY"),
-                            firstTabPanel);
-
-        transportCombo
-            .setSelectedItem(SIPAccountRegistration.DEFAULT_TRANSPORT);
-
-        labelsAdvOpPanel.add(serverLabel);
-        labelsAdvOpPanel.add(displayNameLabel);
-        labelsAdvOpPanel.add(authNameLabel);
-        labelsAdvOpPanel.add(serverPortLabel);
-        labelsAdvOpPanel.add(proxyLabel);
-        labelsAdvOpPanel.add(proxyPortLabel);
-        labelsAdvOpPanel.add(transportLabel);
-
-        valuesAdvOpPanel.add(serverField);
-        valuesAdvOpPanel.add(displayNameField);
-        valuesAdvOpPanel.add(authNameField);
-        valuesAdvOpPanel.add(serverPortField);
-        valuesAdvOpPanel.add(proxyField);
-        valuesAdvOpPanel.add(proxyPortField);
-        valuesAdvOpPanel.add(transportCombo);
-
-        advancedOpPanel.add(labelsAdvOpPanel, BorderLayout.WEST);
-        advancedOpPanel.add(valuesAdvOpPanel, BorderLayout.CENTER);
-
-        JPanel encryptionPanel = new TransparentPanel(new GridLayout(1, 2, 2, 2));
-        encryptionPanel.add(enableDefaultEncryption, BorderLayout.WEST);
-        encryptionPanel.add(enableSipZrtpAttribute, BorderLayout.EAST);
-
-        enableDefaultEncryption.addActionListener(new ActionListener()
-        {
-            public void actionPerformed(ActionEvent evt)
-            {
-                // Perform action
-                JCheckBox cb = (JCheckBox) evt.getSource();
-
-                enableSipZrtpAttribute.setEnabled(cb.isSelected());
-            }
-        });
-
-        advancedOpPanel.add(encryptionPanel, BorderLayout.SOUTH);
-
-        advancedOpPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("plugin.sipaccregwizz.ADVANCED_OPTIONS")));
-
-        advancedPanel.add(advancedOpPanel);
-
-        enablePresOpButton.addActionListener(new ActionListener()
-        {
-            public void actionPerformed(ActionEvent evt)
-            {
-                // Perform action
-                JCheckBox cb = (JCheckBox) evt.getSource();
-
-                setPresenceOptionsEnabled(cb.isSelected());
-            }
-        });
-
-        labelsPresOpPanel.add(pollPeriodLabel);
-        labelsPresOpPanel.add(subscribeExpiresLabel);
-
-        valuesPresOpPanel.add(pollPeriodField);
-        valuesPresOpPanel.add(subscribeExpiresField);
-
-        buttonsPresOpPanel.add(enablePresOpButton);
-        buttonsPresOpPanel.add(forceP2PPresOpButton);
-
-        presenceOpPanel.add(buttonsPresOpPanel, BorderLayout.NORTH);
-        presenceOpPanel.add(labelsPresOpPanel, BorderLayout.WEST);
-        presenceOpPanel.add(valuesPresOpPanel, BorderLayout.CENTER);
-
-        presenceOpPanel.setBorder(BorderFactory.createTitledBorder(
-            Resources.getString("plugin.sipaccregwizz.PRESENCE_OPTIONS")));
-
-        advancedPanel.add(presenceOpPanel);
-
-        JPanel emptyLabelPanel = new TransparentPanel();
-        emptyLabelPanel.setMaximumSize(new Dimension(40, 35));
-
-        keepAliveLabels.add(keepAliveMethodLabel);
-        keepAliveLabels.add(keepAliveIntervalLabel);
-        keepAliveLabels.add(emptyLabelPanel);
-
-        this.keepAliveIntervalExampleLabel.setForeground(Color.GRAY);
-        this.keepAliveIntervalExampleLabel
-            .setFont(uinExampleLabel.getFont().deriveFont(8));
-        this.keepAliveIntervalExampleLabel
-            .setMaximumSize(new Dimension(40, 35));
-        this.keepAliveIntervalExampleLabel
-            .setBorder(BorderFactory.createEmptyBorder(0, 0, 8, 0));
+        this.registrationForm = new SIPAccountRegistrationForm(wizard);
 
-        keepAliveIntervalValue
-            .setText(SIPAccountRegistration.DEFAULT_KEEP_ALIVE_INTERVAL);
-
-        keepAliveMethodBox.setSelectedItem(
-            SIPAccountRegistration.DEFAULT_KEEP_ALIVE_METHOD);
-
-        keepAliveValues.add(keepAliveMethodBox);
-        keepAliveValues.add(keepAliveIntervalValue);
-        keepAliveValues.add(keepAliveIntervalExampleLabel);
-
-        keepAlivePanel.add(keepAliveLabels, BorderLayout.WEST);
-        keepAlivePanel.add(keepAliveValues, BorderLayout.CENTER);
-
-        keepAlivePanel.setBorder(BorderFactory.createTitledBorder(
-            Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE")));
-
-        advancedPanel.add(keepAlivePanel);
-
-        tabbedPane.addTab(
-            Resources.getString("service.gui.ADVANCED"),
-            advancedPanel);
-
-        this.add(tabbedPane, BorderLayout.NORTH);
+        this.add(registrationForm);
     }
 
     /**
      * Implements the <code>WizardPage.getIdentifier</code> to return this
      * page identifier.
+     * @return the page identifier
      */
     public Object getIdentifier()
     {
@@ -373,6 +62,7 @@ public Object getIdentifier()
     /**
      * Implements the <code>WizardPage.getNextPageIdentifier</code> to return
      * the next page identifier - the summary page.
+     * @return the next page identifier
      */
     public Object getNextPageIdentifier()
     {
@@ -393,9 +83,12 @@ public Object getBackPageIdentifier()
     /**
      * Implements the <code>WizardPage.getWizardForm</code> to return this
      * panel.
+     * @return the wizard form
      */
     public Object getWizardForm()
     {
+        registrationForm.init();
+
         return this;
     }
 
@@ -405,7 +98,6 @@ public Object getWizardForm()
      */
     public void pageShowing()
     {
-        this.setNextButtonAccordingToUIN();
         wizard.getWizardContainer().setBackButtonEnabled(false);
     }
 
@@ -414,119 +106,18 @@ public void pageShowing()
      */
     public void commitPage()
     {
-        String uin = userIDField.getText();
-        int indexOfSeparator = uin.indexOf('@');
-        if (indexOfSeparator > -1) {
-            uin = uin.substring(0, indexOfSeparator);
-        }
-
-        SIPAccountRegistration registration = wizard.getRegistration();
-
-        String userID = userIDField.getText();
-
-        if(userID == null || userID.trim().length() == 0)
-            throw new IllegalStateException("No user ID provided.");
-
-        registration.setUserID(userID);
-
-        if (passField.getPassword() != null)
-            registration.setPassword(new String(passField.getPassword()));
-
-        registration.setRememberPassword(rememberPassBox.isSelected());
-
-        registration.setServerAddress(serverField.getText());
-
-        String displayName = displayNameField.getText();
-        registration.setDisplayName(displayName);
-
-        String authName = authNameField.getText();
-        if(authName != null && authName.length() > 0)
-            registration.setAuthorizationName(authName);
-
-        registration.setServerPort(serverPortField.getText());
-        registration.setProxy(proxyField.getText());
-        registration.setProxyPort(proxyPortField.getText());
-
-        //Emil: it appears that sometimes the selected item may be null even
-        //though the combo box does not allow a null selection.
-        Object selectedItem = transportCombo.getSelectedItem();
-
-        if(selectedItem == null)
-            selectedItem = transportCombo.getItemAt(0);
-
-        registration.setPreferredTransport(selectedItem.toString());
-
-        registration.setEnablePresence(enablePresOpButton.isSelected());
-        registration.setForceP2PMode(forceP2PPresOpButton.isSelected());
-        registration.setDefaultEncryption(enableDefaultEncryption.isSelected());
-        registration.setSipZrtpAttribute(enableSipZrtpAttribute.isSelected());
-        registration.setPollingPeriod(pollPeriodField.getText());
-        registration.setSubscriptionExpiration(subscribeExpiresField
-            .getText());
-        registration.setKeepAliveMethod(
-            keepAliveMethodBox.getSelectedItem().toString());
-        registration.setKeepAliveInterval(keepAliveIntervalValue.getText());
-
-        wizard.getWizardContainer().setBackButtonEnabled(true);
+        registrationForm.commitPage(wizard.getRegistration());
 
         nextPageIdentifier = SUMMARY_PAGE_IDENTIFIER;
 
         this.isCommitted = true;
     }
 
-    /**
-     * Enables or disables the "Next" wizard button according to whether the UIN
-     * field is empty.
-     */
-    private void setNextButtonAccordingToUIN()
-    {
-        if (userIDField.getText() == null || userIDField.getText().equals(""))
-        {
-            wizard.getWizardContainer().setNextFinishButtonEnabled(false);
-        }
-        else
-        {
-            wizard.getWizardContainer().setNextFinishButtonEnabled(true);
-        }
-    }
+    public void pageHiding() {}
 
-    /**
-     * Handles the <tt>DocumentEvent</tt> triggered when user types in the UIN
-     * field. Enables or disables the "Next" wizard button according to whether
-     * the UIN field is empty.
-     */
-    public void insertUpdate(DocumentEvent e)
-    {
-        this.setNextButtonAccordingToUIN();
-        this.setServerFieldAccordingToUIN();
-    }
+    public void pageShown() {}
 
-    /**
-     * Handles the <tt>DocumentEvent</tt> triggered when user deletes letters
-     * from the UIN field. Enables or disables the "Next" wizard button
-     * according to whether the UIN field is empty.
-     */
-    public void removeUpdate(DocumentEvent e)
-    {
-        this.setNextButtonAccordingToUIN();
-        this.setServerFieldAccordingToUIN();
-    }
-
-    public void changedUpdate(DocumentEvent e)
-    {
-    }
-
-    public void pageHiding()
-    {
-    }
-
-    public void pageShown()
-    {
-    }
-
-    public void pageBack()
-    {
-    }
+    public void pageBack() {}
 
     /**
      * Fills the UIN and Password fields in this panel with the data coming from
@@ -537,152 +128,13 @@ public void pageBack()
      */
     public void loadAccount(ProtocolProviderService protocolProvider)
     {
-        AccountID accountID = protocolProvider.getAccountID();
-        String password = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.PASSWORD);
-
-        String serverAddress = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.SERVER_ADDRESS);
-
-        String displayName = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.DISPLAY_NAME);
-
-        String authName = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.AUTHORIZATION_NAME);
-
-        String serverPort = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.SERVER_PORT);
-
-        String proxyAddress = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.PROXY_ADDRESS);
-
-        String proxyPort = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.PROXY_PORT);
-
-        String preferredTransport = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.PREFERRED_TRANSPORT);
-
-        boolean enablePresence = accountID.getAccountPropertyBoolean(
-                            ProtocolProviderFactory.IS_PRESENCE_ENABLED, false);
-
-        boolean forceP2P = accountID.getAccountPropertyBoolean(
-                            ProtocolProviderFactory.FORCE_P2P_MODE, false);
-
-        boolean enabledDefaultEncryption = accountID.getAccountPropertyBoolean(
-                            ProtocolProviderFactory.DEFAULT_ENCRYPTION, true);
-
-        boolean enabledSipZrtpAttribute = accountID.getAccountPropertyBoolean(
-                ProtocolProviderFactory.DEFAULT_SIPZRTP_ATTRIBUTE, true);
-
-
-        String pollingPeriod = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.POLLING_PERIOD);
-
-        String subscriptionPeriod = accountID.getAccountPropertyString(
-                            ProtocolProviderFactory.SUBSCRIPTION_EXPIRATION);
-
-        String keepAliveMethod =
-            accountID.getAccountPropertyString("KEEP_ALIVE_METHOD");
-
-        String keepAliveInterval =
-            accountID.getAccountPropertyString("KEEP_ALIVE_INTERVAL");
-
-        this.isServerOverridden = accountID.getAccountPropertyBoolean(
-            ProtocolProviderFactory.IS_SERVER_OVERRIDDEN, false);
-
-        userIDField.setEnabled(false);
-        this.userIDField.setText((serverAddress == null) ? accountID.getUserID()
-            : (accountID.getUserID() + "@" + serverAddress));
-
-        if (password != null)
-        {
-            this.passField.setText(password);
-            this.rememberPassBox.setSelected(true);
-        }
-
-        serverField.setText(serverAddress);
-        serverField.setEnabled(false);
-
-        if (displayName != null && displayName.length() > 0)
-            displayNameField.setText(displayName);
-
-        if(authName != null && authName.length() > 0)
-            authNameField.setText(authName);
-
-        serverPortField.setText(serverPort);
-        proxyField.setText(proxyAddress);
-
-        // The order of the next two fields is important, as a change listener
-        // of the transportCombo sets the proxyPortField to its default
-        transportCombo.setSelectedItem(preferredTransport);
-        proxyPortField.setText(proxyPort);
-
-        enablePresOpButton.setSelected(enablePresence);
-        forceP2PPresOpButton.setSelected(forceP2P);
-
-        enableDefaultEncryption.setSelected(enabledDefaultEncryption);
-        enableSipZrtpAttribute.setSelected(enabledSipZrtpAttribute);
-        enableSipZrtpAttribute.setEnabled(enabledDefaultEncryption);
-
-        pollPeriodField.setText(pollingPeriod);
-        subscribeExpiresField.setText(subscriptionPeriod);
-
-        if (!enablePresence)
-        {
-            setPresenceOptionsEnabled(enablePresence);
-        }
-
-        keepAliveMethodBox.setSelectedItem(keepAliveMethod);
-        keepAliveIntervalValue.setText(keepAliveInterval);
-    }
-
-    /**
-     * Parse the server part from the sip id and set it to server as default
-     * value. If Advanced option is enabled Do nothing.
-     */
-    private void setServerFieldAccordingToUIN()
-    {
-        String serverAddress
-            = wizard.getServerFromUserName(userIDField.getText());
-
-        if (!wizard.isModification() || !isServerOverridden)
-        {
-            serverField.setText(serverAddress);
-            proxyField.setText(serverAddress);
-        }
-    }
-
-    /**
-     * Enables or disable all presence related options.
-     *
-     * @param isEnabled <code>true</code> to enable the presence related
-     * options, <code>false</code> - to disable them.
-     */
-    private void setPresenceOptionsEnabled(boolean isEnabled)
-    {
-        forceP2PPresOpButton.setEnabled(isEnabled);
-        pollPeriodField.setEnabled(isEnabled);
-        subscribeExpiresField.setEnabled(isEnabled);
-    }
-
-    public void itemStateChanged(ItemEvent e)
-    {
-        if (e.getStateChange() == ItemEvent.SELECTED
-            && e.getItem().equals("TLS"))
-        {
-            serverPortField.setText(SIPAccountRegistration.DEFAULT_TLS_PORT);
-            proxyPortField.setText(SIPAccountRegistration.DEFAULT_TLS_PORT);
-        }
-        else
-        {
-            serverPortField.setText(SIPAccountRegistration.DEFAULT_PORT);
-            proxyPortField.setText(SIPAccountRegistration.DEFAULT_PORT);
-        }
+        registrationForm.setModification(wizard.isModification());
+        registrationForm.loadAccount(protocolProvider.getAccountID());
     }
 
     public Object getSimpleForm()
     {
-        return uinPassPanel;
+        return registrationForm.getSimpleForm();
     }
 
     public boolean isCommitted()
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java
new file mode 100644
index 000000000..a9eea7a60
--- /dev/null
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java
@@ -0,0 +1,181 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license. See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.plugin.sipaccregwizz;
+
+import java.awt.*;
+import java.awt.event.*;
+
+import javax.swing.*;
+
+import net.java.sip.communicator.util.swing.*;
+
+/**
+ * The <tt>PresencePanel</tt> is the one containing presence information.
+ *
+ * @author Yana Stamcheva
+ */
+public class PresencePanel
+    extends TransparentPanel
+{
+    private JPanel presenceOpPanel
+        = new TransparentPanel(new BorderLayout(10, 10));
+
+    private JPanel buttonsPresOpPanel =
+        new TransparentPanel(new GridLayout(0, 1, 10, 10));
+
+    private JPanel labelsPresOpPanel
+        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
+
+    private JPanel valuesPresOpPanel
+        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
+
+    private JCheckBox enablePresOpButton =
+        new SIPCommCheckBox(Resources
+            .getString("plugin.sipaccregwizz.ENABLE_PRESENCE"), true);
+
+    private JCheckBox forceP2PPresOpButton =
+        new SIPCommCheckBox(Resources
+            .getString("plugin.sipaccregwizz.FORCE_P2P_PRESENCE"), false);
+
+    private JLabel pollPeriodLabel = new JLabel(
+        Resources.getString(
+            "plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD"));
+
+    private JLabel subscribeExpiresLabel = new JLabel(
+        Resources.getString("plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION"));
+
+    private JTextField pollPeriodField
+        = new JTextField(SIPAccountRegistration.DEFAULT_POLL_PERIOD);
+
+    private JTextField subscribeExpiresField =
+        new JTextField(SIPAccountRegistration.DEFAULT_SUBSCRIBE_EXPIRES);
+
+    /**
+     * Creates an instance of <tt>PresencePanel</tt>.
+     */
+    public PresencePanel()
+    {
+        super(new BorderLayout());
+
+        enablePresOpButton.addActionListener(new ActionListener()
+        {
+            public void actionPerformed(ActionEvent evt)
+            {
+                // Perform action
+                JCheckBox cb = (JCheckBox) evt.getSource();
+
+                setPresenceOptionsEnabled(cb.isSelected());
+            }
+        });
+
+        labelsPresOpPanel.add(pollPeriodLabel);
+        labelsPresOpPanel.add(subscribeExpiresLabel);
+
+        valuesPresOpPanel.add(pollPeriodField);
+        valuesPresOpPanel.add(subscribeExpiresField);
+
+        buttonsPresOpPanel.add(enablePresOpButton);
+        buttonsPresOpPanel.add(forceP2PPresOpButton);
+
+        presenceOpPanel.add(buttonsPresOpPanel, BorderLayout.NORTH);
+        presenceOpPanel.add(labelsPresOpPanel, BorderLayout.WEST);
+        presenceOpPanel.add(valuesPresOpPanel, BorderLayout.CENTER);
+
+        presenceOpPanel.setBorder(BorderFactory.createTitledBorder(
+            Resources.getString("plugin.sipaccregwizz.PRESENCE_OPTIONS")));
+
+        this.add(presenceOpPanel, BorderLayout.NORTH);
+    }
+
+    /**
+     * Enables or disable all presence related options.
+     *
+     * @param isEnabled <code>true</code> to enable the presence related
+     * options, <code>false</code> - to disable them.
+     */
+    void setPresenceOptionsEnabled(boolean isEnabled)
+    {
+        forceP2PPresOpButton.setEnabled(isEnabled);
+        pollPeriodField.setEnabled(isEnabled);
+        subscribeExpiresField.setEnabled(isEnabled);
+    }
+
+    /**
+     * Indicates if the presence is enabled.
+     * @return <tt>true</tt> if the presence is enabled, <tt>false</tt> -
+     * otherwise
+     */
+    boolean isPresenceEnabled()
+    {
+        return enablePresOpButton.isSelected();
+    }
+
+    /**
+     * Enables/disables the presence.
+     * @param isPresenceEnabled <tt>true</tt> to enable the presence,
+     * <tt>false</tt> - otherwise
+     */
+    void setPresenceEnabled(boolean isPresenceEnabled)
+    {
+        enablePresOpButton.setSelected(isPresenceEnabled);
+    }
+
+    /**
+     * Indicates if the peer-to-peer presence mode is selected.
+     * @return <tt>true</tt> if the peer-to-peer presence mode is selected,
+     * <tt>false</tt> - otherwise.
+     */
+    boolean isForcePeerToPeerMode()
+    {
+        return forceP2PPresOpButton.isSelected();
+    }
+
+    /**
+     * Enables/disables the peer-to-peer presence mode.
+     * @param forceP2P <tt>true</tt> to select the peer-to-peer presence mode,
+     * <tt>false</tt> - otherwise.
+     */
+    void setForcePeerToPeerMode(boolean forceP2P)
+    {
+        forceP2PPresOpButton.setSelected(forceP2P);
+    }
+
+    /**
+     * Returns the poll period.
+     * @return the poll period
+     */
+    String getPollPeriod()
+    {
+        return pollPeriodField.getText();
+    }
+
+    /**
+     * Sets the poll period.
+     * @param pollPeriod the poll period
+     */
+    void setPollPeriod(String pollPeriod)
+    {
+        pollPeriodField.setText(pollPeriod);
+    }
+
+    /**
+     * Returns the subscription expiration information.
+     * @return the subscription expiration information
+     */
+    String getSubscriptionExpiration()
+    {
+        return subscribeExpiresField.getText();
+    }
+
+    /**
+     * Sets the subscription expiration information.
+     * @param subscExp the subscription expiration information
+     */
+    void setSubscriptionExpiration(String subscExp)
+    {
+        subscribeExpiresField.setText(subscExp);
+    }
+}
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java
new file mode 100644
index 000000000..d85aad74f
--- /dev/null
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java
@@ -0,0 +1,331 @@
+package net.java.sip.communicator.plugin.sipaccregwizz;
+
+import java.awt.*;
+
+import javax.swing.*;
+
+import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.util.swing.*;
+
+/**
+ * The <tt>SIPAccountRegistrationForm</tt>.
+ *
+ * @author Yana Stamcheva
+ */
+public class SIPAccountRegistrationForm
+    extends TransparentPanel
+{
+    private final AccountPanel accountPanel;
+
+    private final ConnectionPanel connectionPanel;
+
+    private final PresencePanel presencePanel;
+
+    private boolean isModification;
+
+    private final SIPAccountRegistrationWizard wizard;
+
+    private final JTabbedPane tabbedPane = new SIPCommTabbedPane(false, false);
+
+    /**
+     * Creates an instance of <tt>SIPAccountRegistrationForm</tt>.
+     * @param wizard the parent wizard
+     */
+    public SIPAccountRegistrationForm(SIPAccountRegistrationWizard wizard)
+    {
+        super(new BorderLayout());
+
+        this.wizard = wizard;
+
+        accountPanel = new AccountPanel(this);
+
+        connectionPanel = new ConnectionPanel(this);
+
+        presencePanel = new PresencePanel();
+    }
+
+    /**
+     * Initializes all panels, buttons, etc.
+     */
+    void init()
+    {
+        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+
+        accountPanel.initAdvancedForm();
+
+        if (accountPanel.getParent() != tabbedPane)
+            tabbedPane.addTab(  Resources.getString("service.gui.ACCOUNT"),
+                                accountPanel);
+
+        if (connectionPanel.getParent() != tabbedPane)
+            tabbedPane.addTab(Resources.getString("service.gui.CONNECTION"),
+                                connectionPanel);
+
+        if (presencePanel.getParent() != tabbedPane)
+            tabbedPane.addTab(Resources.getString("service.gui.PRESENCE"),
+                                presencePanel);
+
+        if (tabbedPane.getParent() != this)
+            this.add(tabbedPane, BorderLayout.NORTH);
+
+        tabbedPane.setSelectedIndex(0);
+    }
+
+    /**
+     * Parse the server part from the sip id and set it to server as default
+     * value. If Advanced option is enabled Do nothing.
+     * @param userName the account user name
+     */
+    void setServerFieldAccordingToUIN(String userName)
+    {
+        String serverAddress = getServerFromUserName(userName);
+
+        connectionPanel.setServerFieldAccordingToUIN(serverAddress);
+    }
+
+    /**
+     * Enables/disables the next/finish button of the parent wizard.
+     * @param isEnabled <tt>true</tt> to enable the next button, <tt>false</tt>
+     * otherwise
+     */
+    void setNextFinishButtonEnabled(boolean isEnabled)
+    {
+        SIPAccRegWizzActivator.getUIService().getAccountRegWizardContainer()
+            .setNextFinishButtonEnabled(isEnabled);
+    }
+
+    /**
+     * Return the server part of the sip user name.
+     *
+     * @param userName the username.
+     * @return the server part of the sip user name.
+     */
+    private String getServerFromUserName(String userName)
+    {
+        int delimIndex = userName.indexOf("@");
+        if (delimIndex != -1)
+        {
+            return userName.substring(delimIndex + 1);
+        }
+
+        return null;
+    }
+
+    /**
+     * Indicates if this wizard is modifying an existing account or is creating
+     * a new one.
+     * 
+     * @return <code>true</code> to indicate that this wizard is currently in
+     * modification mode, <code>false</code> - otherwise.
+     */
+    public boolean isModification()
+    {
+        return isModification;
+    }
+
+    /**
+     * Saves the user input when the "Next" wizard buttons is clicked.
+     * @param registration the SIPAccountRegistration
+     */
+    public void commitPage(SIPAccountRegistration registration)
+    {
+        String userID = accountPanel.getUserID();
+
+        if(userID == null || userID.trim().length() == 0)
+            throw new IllegalStateException("No user ID provided.");
+
+        registration.setUserID(userID);
+
+        char[] password = accountPanel.getPassword();
+        if (password != null)
+            registration.setPassword(new String(password));
+
+        registration.setRememberPassword(accountPanel.isRememberPassword());
+
+        registration.setServerAddress(connectionPanel.getServerAddress());
+
+        String displayName = accountPanel.getDisplayName();
+        registration.setDisplayName(displayName);
+
+        String authName = connectionPanel.getAuthenticationName();
+        if(authName != null && authName.length() > 0)
+            registration.setAuthorizationName(authName);
+
+        registration.setServerPort(connectionPanel.getServerPort());
+        registration.setProxy(connectionPanel.getProxy());
+        registration.setProxyPort(connectionPanel.getProxyPort());
+
+        registration.setPreferredTransport(
+            connectionPanel.getSelectedTransport());
+
+        registration.setEnablePresence(
+            presencePanel.isPresenceEnabled());
+        registration.setForceP2PMode(
+            presencePanel.isForcePeerToPeerMode());
+        registration.setDefaultEncryption(
+            connectionPanel.isDefaultEncryptionEnabled());
+        registration.setSipZrtpAttribute(
+            connectionPanel.isSipZrtpEnabled());
+        registration.setPollingPeriod(
+            presencePanel.getPollPeriod());
+        registration.setSubscriptionExpiration(
+            presencePanel.getSubscriptionExpiration());
+        registration.setKeepAliveMethod(
+            connectionPanel.getKeepAliveMethod());
+        registration.setKeepAliveInterval(
+            connectionPanel.getKeepAliveInterval());
+
+        SIPAccRegWizzActivator.getUIService().getAccountRegWizardContainer()
+            .setBackButtonEnabled(true);
+    }
+
+    /**
+     * Loads the account with the given identifier.
+     * @param accountID the account identifier
+     */
+    public void loadAccount(AccountID accountID)
+    {
+        String password = accountID.getAccountPropertyString(
+            ProtocolProviderFactory.PASSWORD);
+
+        String serverAddress = accountID.getAccountPropertyString(
+                    ProtocolProviderFactory.SERVER_ADDRESS);
+
+        String displayName = accountID.getAccountPropertyString(
+                    ProtocolProviderFactory.DISPLAY_NAME);
+
+        String authName = accountID.getAccountPropertyString(
+                    ProtocolProviderFactory.AUTHORIZATION_NAME);
+
+        String serverPort = accountID.getAccountPropertyString(
+                    ProtocolProviderFactory.SERVER_PORT);
+
+        String proxyAddress = accountID.getAccountPropertyString(
+                    ProtocolProviderFactory.PROXY_ADDRESS);
+
+        String proxyPort = accountID.getAccountPropertyString(
+                    ProtocolProviderFactory.PROXY_PORT);
+
+        String preferredTransport = accountID.getAccountPropertyString(
+                    ProtocolProviderFactory.PREFERRED_TRANSPORT);
+
+        boolean enablePresence = accountID.getAccountPropertyBoolean(
+                    ProtocolProviderFactory.IS_PRESENCE_ENABLED, false);
+
+        boolean forceP2P = accountID.getAccountPropertyBoolean(
+                    ProtocolProviderFactory.FORCE_P2P_MODE, false);
+
+        boolean enabledDefaultEncryption = accountID.getAccountPropertyBoolean(
+                    ProtocolProviderFactory.DEFAULT_ENCRYPTION, true);
+
+        boolean enabledSipZrtpAttribute = accountID.getAccountPropertyBoolean(
+        ProtocolProviderFactory.DEFAULT_SIPZRTP_ATTRIBUTE, true);
+
+        String pollingPeriod = accountID.getAccountPropertyString(
+                    ProtocolProviderFactory.POLLING_PERIOD);
+
+        String subscriptionPeriod = accountID.getAccountPropertyString(
+                    ProtocolProviderFactory.SUBSCRIPTION_EXPIRATION);
+
+        String keepAliveMethod =
+        accountID.getAccountPropertyString("KEEP_ALIVE_METHOD");
+
+        String keepAliveInterval =
+        accountID.getAccountPropertyString("KEEP_ALIVE_INTERVAL");
+
+        connectionPanel.setServerOverridden(
+            accountID.getAccountPropertyBoolean(
+                ProtocolProviderFactory.IS_SERVER_OVERRIDDEN, false));
+
+        accountPanel.setUserIDEnabled(false);
+        accountPanel.setUserID((serverAddress == null) ? accountID.getUserID()
+            : (accountID.getUserID() + "@" + serverAddress));
+
+        setNextFinishButtonEnabled(accountPanel.getUserID() != null);
+
+        if (password != null)
+        {
+            accountPanel.setPassword(password);
+            accountPanel.setRememberPassword(true);
+        }
+
+        connectionPanel.setServerAddress(serverAddress);
+        connectionPanel.setServerEnabled(false);
+
+        if (displayName != null && displayName.length() > 0)
+            accountPanel.setDisplayName(displayName);
+
+        if(authName != null && authName.length() > 0)
+            connectionPanel.setAuthenticationName(authName);
+
+        connectionPanel.setServerPort(serverPort);
+        connectionPanel.setProxy(proxyAddress);
+
+        // The order of the next two fields is important, as a change listener
+        // of the transportCombo sets the proxyPortField to its default
+        connectionPanel.setSelectedTransport(preferredTransport);
+        connectionPanel.setProxyPort(proxyPort);
+
+        presencePanel.setPresenceEnabled(enablePresence);
+        presencePanel.setForcePeerToPeerMode(forceP2P);
+
+        connectionPanel.enablesDefaultEncryption(enabledDefaultEncryption);
+        connectionPanel.setSipZrtpEnabled(  enabledSipZrtpAttribute,
+                                            enabledDefaultEncryption);
+
+        presencePanel.setPollPeriod(pollingPeriod);
+        presencePanel.setSubscriptionExpiration(subscriptionPeriod);
+
+        if (!enablePresence)
+        {
+            presencePanel.setPresenceOptionsEnabled(enablePresence);
+        }
+
+        connectionPanel.setKeepAliveMethod(keepAliveMethod);
+        connectionPanel.setKeepAliveInterval(keepAliveInterval);
+    }
+
+    /**
+     * Returns a simple version of this registration form.
+     * @return the simple form component
+     */
+    public Component getSimpleForm()
+    {
+        return accountPanel;
+    }
+
+    /**
+     * Sets the isModification property.
+     * @param isModification indicates if this form is created for modification
+     */
+    public void setModification(boolean isModification)
+    {
+        this.isModification = isModification;
+    }
+
+    /**
+     * Returns the username example.
+     * @return the username example string
+     */
+    public String getUsernameExample()
+    {
+        return wizard.getUserNameExample();
+    }
+
+    /**
+     * Sign ups through the web.
+     */
+    public void webSignup()
+    {
+        wizard.webSignup();
+    }
+
+    /**
+     * Returns the sign up link name.
+     * @return the sign up link name
+     */
+    public String getWebSignupLinkName()
+    {
+        return wizard.getWebSignupLinkName();
+    }
+}
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
index db15a9462..e4498d5da 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
@@ -90,7 +90,6 @@ public byte[] getPageImage()
         return Resources.getImage(Resources.PAGE_IMAGE);
     }
 
-
     /**
      * Implements the <code>AccountRegistrationWizard.getProtocolName</code>
      * method. Returns the protocol name for this wizard.
@@ -115,7 +114,10 @@ public String getProtocolDescription() {
      */
     public Iterator<WizardPage> getPages() {
         java.util.List<WizardPage> pages = new ArrayList<WizardPage>();
-        firstWizardPage = new FirstWizardPage(this);
+
+        // If the first wizard page was already created
+        if (firstWizardPage == null)
+            firstWizardPage = new FirstWizardPage(this);
 
         pages.add(firstWizardPage);
 
@@ -250,6 +252,8 @@ public ProtocolProviderService signin()
 
     /**
      * Installs the account with the given user name and password.
+     * @param userName the account user name
+     * @param password the password
      * @return the <tt>ProtocolProviderService</tt> corresponding to the newly
      * created account.
      * @throws OperationFailedException problem signing in.
@@ -288,6 +292,17 @@ private ProtocolProviderService installAccount(
         Hashtable<String, String> accountProperties
             = new Hashtable<String, String>();
 
+        accountProperties.put(ProtocolProviderFactory.PROTOCOL, getProtocol());
+        String protocolIconPath = getProtocolIconPath();
+        if (protocolIconPath != null)
+            accountProperties.put(  ProtocolProviderFactory.PROTOCOL_ICON_PATH,
+                                    protocolIconPath);
+
+        String accountIconPath = getAccountIconPath();
+        if (accountIconPath != null)
+            accountProperties.put(  ProtocolProviderFactory.ACCOUNT_ICON_PATH,
+                                    accountIconPath);
+
         if(registration.isRememberPassword())
         {
             accountProperties.put(ProtocolProviderFactory.PASSWORD, passwd);
@@ -296,8 +311,6 @@ private ProtocolProviderService installAccount(
         String serverAddress = null;
         if (registration.getServerAddress() != null)
             serverAddress = registration.getServerAddress();
-        else
-            serverAddress = getServerFromUserName(userName);
 
         if (serverAddress != null)
         {
@@ -324,8 +337,6 @@ private ProtocolProviderService installAccount(
         String proxyAddress = null;
         if (registration.getProxy() != null)
             proxyAddress = registration.getProxy();
-        else
-            proxyAddress = getServerFromUserName(userName);
 
         if (proxyAddress != null)
             accountProperties.put(ProtocolProviderFactory.PROXY_ADDRESS,
@@ -512,11 +523,12 @@ public void setModification(boolean isModification)
      */
     public String getUserNameExample()
     {
-        return FirstWizardPage.USER_NAME_EXAMPLE;
+        return "Ex: john@voiphone.net or simply \"john\" for no server";
     }
 
     /**
      * Enables the simple "Sign in" form.
+     * @return <tt>true</tt> to indicate that the simple form is enabled
      */
     public boolean isSimpleFormEnabled()
     {
@@ -524,26 +536,17 @@ public boolean isSimpleFormEnabled()
     }
 
     /**
-     * Return the server part of the sip user name.
-     *
-     * @param userName the username.
-     * @return the server part of the sip user name.
+     * Sign ups through the web.
      */
-    protected String getServerFromUserName(String userName)
-    {
-        int delimIndex = userName.indexOf("@");
-        if (delimIndex != -1)
-        {
-            return userName.substring(delimIndex + 1);
-        }
-
-        return null;
-    }
+    public void webSignup() {}
 
-    public void webSignup()
+    /**
+     * Returns the name of the web sign up link.
+     * @return the name of the web sign up link
+     */
+    public String getWebSignupLinkName()
     {
-        SIPAccRegWizzActivator.getBrowserLauncher()
-            .openURL("http://serweb.iptel.org/user/reg/index.php");
+        return null;
     }
 
     /**
@@ -557,9 +560,41 @@ public boolean isWebSignupSupported()
         return true;
     }
 
+    /**
+     * Returns the simple form.
+     * @return the simple form
+     */
     public Object getSimpleForm()
     {
         firstWizardPage = new FirstWizardPage(this);
         return firstWizardPage.getSimpleForm();
     }
+
+    /**
+     * Returns the protocol name as listed in "ProtocolNames" or just the name
+     * of the service.
+     * @return the protocol name
+     */
+    public String getProtocol()
+    {
+        return ProtocolNames.SIP;
+    }
+
+    /**
+     * Returns the protocol icon path.
+     * @return the protocol icon path
+     */
+    public String getProtocolIconPath()
+    {
+        return null;
+    }
+
+    /**
+     * Returns the account icon path.
+     * @return the account icon path
+     */
+    public String getAccountIconPath()
+    {
+        return null;
+    }
 }
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
index e997b839e..9e12c4cf8 100755
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
@@ -4,6 +4,7 @@ Bundle-Description: SIP account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 System-Bundle: yes
+Export-package: net.java.sip.communicator.plugin.sipaccregwizz
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,