diff --git a/Classes/Base.lproj/ContactsListView.xib b/Classes/Base.lproj/ContactsListView.xib
index ac7f39865..69ff91400 100644
--- a/Classes/Base.lproj/ContactsListView.xib
+++ b/Classes/Base.lproj/ContactsListView.xib
@@ -19,6 +19,7 @@
                 <outlet property="loadingView" destination="CM2-Aq-Q3g" id="uie-SJ-TKf"/>
                 <outlet property="searchBar" destination="5jE-oF-d45" id="xfS-xo-2Bm"/>
                 <outlet property="selectedButtonImage" destination="A9k-KU-Dlm" id="4dX-pd-Y2D"/>
+                <outlet property="switchView" destination="93" id="4iM-Fl-F9B"/>
                 <outlet property="tableController" destination="TJG-JZ-YRR" id="0lt-gC-EOm"/>
                 <outlet property="toggleSelectionButton" destination="5lZ-u7-Yex" id="ULR-WM-Yuo"/>
                 <outlet property="topBar" destination="3" id="w1O-2o-b18"/>
diff --git a/Classes/ContactsListView.h b/Classes/ContactsListView.h
index 999d74e7f..23835b8c8 100644
--- a/Classes/ContactsListView.h
+++ b/Classes/ContactsListView.h
@@ -50,6 +50,7 @@ typedef enum _ContactSelectionMode { ContactSelectionModeNone, ContactSelectionM
 
 @property(strong, nonatomic) IBOutlet ContactsListTableView *tableController;
 @property(strong, nonatomic) IBOutlet UIView *topBar;
+@property(strong, nonatomic) IBOutlet UIView *switchView;
 @property(nonatomic, strong) IBOutlet UIButton *allButton;
 @property(nonatomic, strong) IBOutlet UIButton *linphoneButton;
 @property(nonatomic, strong) IBOutlet UIButton *addButton;
diff --git a/Classes/ContactsListView.m b/Classes/ContactsListView.m
index 18f6b6c35..447d77694 100644
--- a/Classes/ContactsListView.m
+++ b/Classes/ContactsListView.m
@@ -97,7 +97,9 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if (![[PhoneMainView.instance  getPreviousViewName] isEqualToString:@"ContactDetailsView"]) {
 		_searchBar.text = @"";
 	}
-	[self changeView:ContactsAll];
+	if (![LinphoneManager.instance lpConfigBoolForKey:@"only_show_sip_contacts_list"] && ![LinphoneManager.instance lpConfigBoolForKey:@"hide_sip_contacts_list"]) {
+		[self changeView:ContactsAll];
+	}
 	
 	UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]
 								   initWithTarget:self
@@ -105,6 +107,15 @@ static UICompositeViewDescription *compositeDescription = nil;
 	
 	[tap setDelegate:self];
 	[self.view addGestureRecognizer:tap];
+	
+	
+	if ([LinphoneManager.instance lpConfigBoolForKey:@"only_show_sip_contacts_list"]) {
+		_switchView.hidden = true;
+		[self changeView:ContactsLinphone];
+ 	} else if ([LinphoneManager.instance lpConfigBoolForKey:@"hide_sip_contacts_list"]){
+		_switchView.hidden = true;
+		[self changeView:ContactsAll];
+ 	}
 }
 
 - (void)viewWillAppear:(BOOL)animated {