diff --git a/res/layout/setup_menu.xml b/res/layout/setup_menu.xml
index 0aadb9308..e778a62f0 100644
--- a/res/layout/setup_menu.xml
+++ b/res/layout/setup_menu.xml
@@ -41,6 +41,7 @@
         </RelativeLayout>
         
         <RelativeLayout
+            android:id="@+id/setup_login_linphone_layout"
 		    android:layout_width="match_parent"
 		    android:layout_height="match_parent"
 		    android:layout_weight="0.7"
@@ -64,6 +65,7 @@
         </RelativeLayout>
         
         <RelativeLayout
+            android:id="@+id/setup_login_generic_layout"
 		    android:layout_width="match_parent"
 		    android:layout_height="match_parent"
 		    android:layout_weight="0.7"
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 24662a71d..1a38eb70f 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -18,6 +18,8 @@
     
     <bool name="hide_camera_settings">false</bool>
     <bool name="hide_wizard">false</bool>
+    <bool name="hide_linphone_accounts_wizard">false</bool>
+    <bool name="hide_generic_accounts_wizard">false</bool>
     <bool name="hide_accounts">false</bool>
 	<bool name="useFirstLoginActivity">true</bool>
 	
diff --git a/src/org/linphone/setup/MenuFragment.java b/src/org/linphone/setup/MenuFragment.java
index 704aa580c..c5242ee3b 100644
--- a/src/org/linphone/setup/MenuFragment.java
+++ b/src/org/linphone/setup/MenuFragment.java
@@ -41,10 +41,18 @@ public class MenuFragment extends Fragment implements OnClickListener {
 		createAccount.setOnClickListener(this);
 		
 		logLinphoneAccount = (ImageView) view.findViewById(R.id.setup_login_linphone);
-		logLinphoneAccount.setOnClickListener(this);
+		if (getResources().getBoolean(R.bool.hide_linphone_accounts_wizard)) {
+			view.findViewById(R.id.setup_login_linphone_layout).setVisibility(View.GONE);
+		} else {
+			logLinphoneAccount.setOnClickListener(this);
+		}
 		
 		logGenericAccount = (ImageView) view.findViewById(R.id.setup_login_generic);
-		logGenericAccount.setOnClickListener(this);
+		if (getResources().getBoolean(R.bool.hide_generic_accounts_wizard)) {
+			view.findViewById(R.id.setup_login_generic_layout).setVisibility(View.GONE);
+		} else {
+			logGenericAccount.setOnClickListener(this);
+		}
 		
 		return view;
 	}