diff -r a6ef9729d1d4 DefineWengoOptions.cmake
--- a/DefineWengoOptions.cmake	Mon Aug 18 18:17:50 2008 +0200
+++ b/DefineWengoOptions.cmake	Tue Aug 19 11:58:54 2008 +0200
@@ -38,6 +38,8 @@
 
 option(ENABLE_CRASHREPORT "Enable integrated crashreport system" ON)
 
+option(CUSTOM_ACCOUNT "Enable custom account" OFF)
+
 if (WIN32)
 	option(ENABLE_CONSOLE "Force generate of executable with Console Window enabled" OFF)
 	option(FFMPEG_OLD_VERSION "Use the old version of ffmpeg" OFF)
diff -r a6ef9729d1d4 wengophone/src/presentation/qt/CMakeLists.txt
--- a/wengophone/src/presentation/qt/CMakeLists.txt	Mon Aug 18 18:17:50 2008 +0200
+++ b/wengophone/src/presentation/qt/CMakeLists.txt	Tue Aug 19 11:58:54 2008 +0200
@@ -481,6 +481,13 @@
 	statusbar/StatusBarWidget.ui
 )
 
+if (CUSTOM_ACCOUNT)
+		ow_add_private_definitions(
+			-DCUSTOM_ACCOUNT
+		)
+		message(STATUS "Custom account activated")
+endif (CUSTOM_ACCOUNT)
+
 if (APPLE)
 	ow_use_private_frameworks(
 		Cocoa
diff -r a6ef9729d1d4 wengophone/src/presentation/qt/QtToolBar.cpp
--- a/wengophone/src/presentation/qt/QtToolBar.cpp	Mon Aug 18 18:17:50 2008 +0200
+++ b/wengophone/src/presentation/qt/QtToolBar.cpp	Tue Aug 19 11:58:54 2008 +0200
@@ -163,6 +163,11 @@
 	
 	//a menu is about to be displayed
 	SAFE_CONNECT(_ui->menuActions, SIGNAL(aboutToShow()), SLOT(updateMenuActions()));
+
+#ifdef CUSTOM_ACCOUNT
+	_ui->actionSearchWengoContact->setVisible(false);
+#endif
+
 }
 
 QtToolBar::~QtToolBar() {
diff -r a6ef9729d1d4 wengophone/src/presentation/qt/QtWengoPhone.cpp
--- a/wengophone/src/presentation/qt/QtWengoPhone.cpp	Mon Aug 18 18:17:50 2008 +0200
+++ b/wengophone/src/presentation/qt/QtWengoPhone.cpp	Tue Aug 19 11:58:54 2008 +0200
@@ -160,6 +160,10 @@
 
 	_ui = new Ui::WengoPhoneWindow();
 	_ui->setupUi(_wengoPhoneWindow);
+
+#ifdef CUSTOM_ACCOUNT
+	_ui->actionShowWengoAccount->setVisible(false);
+#endif
 
 #ifdef OS_MACOSX
 	fixMacOSXMenus();
diff -r a6ef9729d1d4 wengophone/src/presentation/qt/config/QtAudioSettings.cpp
--- a/wengophone/src/presentation/qt/config/QtAudioSettings.cpp	Mon Aug 18 18:17:50 2008 +0200
+++ b/wengophone/src/presentation/qt/config/QtAudioSettings.cpp	Tue Aug 19 11:58:54 2008 +0200
@@ -70,6 +70,10 @@
 	SAFE_CONNECT(_ui->DownButton, SIGNAL(pressed()), SLOT(DownPressed()));
 	SAFE_CONNECT(_ui->ResetButton, SIGNAL(pressed()), SLOT(ResetPressed()));
 	_ui->AdvGroupBox->setVisible(false);
+
+#ifdef CUSTOM_ACCOUNT
+	_ui->enableWenboxCheckBox->setVisible(false);
+#endif
 
 	readConfig();
 }
diff -r a6ef9729d1d4 wengophone/src/presentation/qt/login/QtLogAccount.cpp
--- a/wengophone/src/presentation/qt/login/QtLogAccount.cpp	Mon Aug 18 18:17:50 2008 +0200
+++ b/wengophone/src/presentation/qt/login/QtLogAccount.cpp	Tue Aug 19 11:58:54 2008 +0200
@@ -58,6 +58,10 @@
 	SAFE_CONNECT(_ui->modifyButton, SIGNAL(clicked()), SLOT(modifyClicked()));
 	SAFE_CONNECT(_ui->helpLabel, SIGNAL(linkActivated(const QString &)), SLOT(helpButtonClicked()));
 	SAFE_CONNECT(_ui->forgotPasswordLabel, SIGNAL(linkActivated(const QString &)), SLOT(forgotPasswordButtonClicked()));
+
+#ifdef CUSTOM_ACCOUNT
+	_ui->forgotPasswordLabel->hide();
+#endif
 }
 
 QtLogAccount::~QtLogAccount() {
diff -r a6ef9729d1d4 wengophone/src/presentation/qt/login/QtLoginDialog.cpp
--- a/wengophone/src/presentation/qt/login/QtLoginDialog.cpp	Mon Aug 18 18:17:50 2008 +0200
+++ b/wengophone/src/presentation/qt/login/QtLoginDialog.cpp	Tue Aug 19 11:58:54 2008 +0200
@@ -70,11 +70,21 @@
 }
 
 void QtLoginDialog::changePage(int newPage, std::string sipAccountName) {
-	if ( (newPage >= 0) && (newPage < _centralWidget->count())) {
-		_centralWidget->setCurrentIndex(newPage);
-		_loginPage[newPage]->initPage();
+	if ( (newPage >= 0) && (newPage < _centralWidget->count())) 
+	{
+		int page = newPage ;
+		
+	#ifdef CUSTOM_ACCOUNT
+		if( page == 0)
+		{
+			page = 2;
+		}
+	#endif
+		
+		_centralWidget->setCurrentIndex(page);
+		_loginPage[page]->initPage();
 		if (!sipAccountName.empty()) {
-			_loginPage[newPage]->load(sipAccountName);
+			_loginPage[page]->load(sipAccountName);
 		}
 	}
 }