diff --git a/templates/groups/add.php b/templates/groups/add.php
index 421b796..788c76f 100755
--- a/templates/groups/add.php
+++ b/templates/groups/add.php
@@ -44,13 +44,13 @@
 										<span class="input-group-addon"><span class="fa fa-users"></span></span>
 										<input name="name" class="form-control" type="text" placeholder="Nom groupe" autofocus required>
 									</div>
-								</div>	
+								</div>
 								<div class="form-group">
 									<label>Contacts au groupe</label>
 									<input class="add-contacts form-control" name="contacts[]"/>
 								</div>
 								<a class="btn btn-danger" href="<?php echo $this->generateUrl('groups'); ?>">Annuler</a>
-								<input type="submit" class="btn btn-success" value="Enregistrer le contact" /> 	
+								<input type="submit" class="btn btn-success" value="Enregistrer le contact" />
 							</form>
 						</div>
 					</div>
@@ -66,8 +66,8 @@
 		{
 			jQuery(this).magicSuggest({
 				data: '<?php echo $this->generateUrl('contacts', 'jsonGetContacts'); ?>',
-				valueField: 'id',
-				displayField: 'name',
+				valueField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>id',
+				displayField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>name',
 				name: 'contacts[]'
 			});
 		});
diff --git a/templates/groups/edit.php b/templates/groups/edit.php
index a6e18b9..548671a 100755
--- a/templates/groups/edit.php
+++ b/templates/groups/edit.php
@@ -55,7 +55,7 @@
 											<span class="input-group-addon"><span class="fa fa-user"></span></span>
 											<input name="groups[<?php secho($group['id']); ?>][name]" class="form-control" type="text" placeholder="Nom groupe" autofocus required value="<?php secho($group['name']); ?>">
 										</div>
-									</div>	
+									</div>
 									<div class="form-group">
 										<label>Contacts du groupe</label>
 										<input class="add-contacts form-control" name="groups[<?php secho($group['id']); ?>][contacts][]" value="<?php secho($contacts); ?>"/>
@@ -65,7 +65,7 @@
 								}
 							?>
 								<a class="btn btn-danger" href="<?php echo $this->generateUrl('groups'); ?>">Annuler</a>
-								<input type="submit" class="btn btn-success" value="Enregistrer le contact" /> 	
+								<input type="submit" class="btn btn-success" value="Enregistrer le contact" />
 							</form>
 						</div>
 					</div>
@@ -81,8 +81,8 @@
 		{
 			jQuery(this).magicSuggest({
 				data: '<?php echo $this->generateUrl('contacts', 'jsonGetContacts'); ?>',
-				valueField: 'id',
-				displayField: 'name',
+				valueField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>id',
+				displayField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>name',
 			});
 		});
 	});
diff --git a/templates/scheduleds/add.php b/templates/scheduleds/add.php
index 34f5878..55e30bd 100755
--- a/templates/scheduleds/add.php
+++ b/templates/scheduleds/add.php
@@ -45,7 +45,7 @@
 								<div class="form-group">
 									<label>Date d'envoi du SMS</label>
 									<input name="date" class="form-control form-datetime" type="text" value="<?php secho($now); ?>" readonly>
-								</div>	
+								</div>
 								<div class="form-group">
 									<label>Numéros cibles</label>
 									<div class="form-group scheduleds-number-group-container">
@@ -69,13 +69,13 @@
 									<div class="form-group">
 										<label>Envoyer comme un SMS Flash : </label>
 										<div class="form-group">
-											<input name="admin" type="radio" value="1" required /> Oui 
+											<input name="admin" type="radio" value="1" required /> Oui
 											<input name="admin" type="radio" value="0" required checked/> Non
 										</div>
 									</div>
 								<?php } ?>
 								<a class="btn btn-danger" href="<?php echo $this->generateUrl('scheduleds'); ?>">Annuler</a>
-								<input type="submit" class="btn btn-success" value="Enregistrer le SMS" /> 	
+								<input type="submit" class="btn btn-success" value="Enregistrer le SMS" />
 							</form>
 						</div>
 					</div>
@@ -91,8 +91,8 @@
 		{
 			jQuery(this).magicSuggest({
 				data: '<?php echo $this->generateUrl('contacts', 'jsonGetContacts'); ?>',
-				valueField: 'id',
-				displayField: 'name',
+				valueField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>id',
+				displayField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>name',
 			});
 		});
 
@@ -154,7 +154,7 @@
 				var container = jQuery(this).parents('.scheduleds-number-group');
 				container.find('.phone-hidden-input').val(jQuery(this).intlTelInput("getNumber"));
 			});
-			
+
 			this.submit();
 		});
 	});
diff --git a/templates/scheduleds/edit.php b/templates/scheduleds/edit.php
index 0681ca0..7c94e9d 100755
--- a/templates/scheduleds/edit.php
+++ b/templates/scheduleds/edit.php
@@ -49,7 +49,7 @@
 									<div class="form-group">
 										<label>Date d'envoi du SMS</label>
 										<input name="scheduleds[<?php secho($scheduled['id']); ?>][date]" class="form-control form-datetime" type="text" value="<?php secho($scheduled['at']); ?>" readonly>
-									</div>	
+									</div>
 									<div class="form-group">
 										<label>Numéros cibles</label>
 										<div class="form-group scheduleds-number-group-container" scheduled-id="<?php secho($scheduled['id']); ?>" >
@@ -85,7 +85,7 @@
 								}
 							?>
 								<a class="btn btn-danger" href="<?php echo $this->generateUrl('scheduleds'); ?>">Annuler</a>
-								<input type="submit" class="btn btn-success" value="Enregistrer le SMS" /> 	
+								<input type="submit" class="btn btn-success" value="Enregistrer le SMS" />
 							</form>
 						</div>
 					</div>
@@ -109,8 +109,8 @@
 		{
 			jQuery(this).magicSuggest({
 				data: '<?php echo $this->generateUrl('contacts', 'jsonGetContacts'); ?>',
-				valueField: 'id',
-				displayField: 'name',
+				valueField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>id',
+				displayField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>name',
 			});
 		});
 
@@ -173,7 +173,7 @@
 				var container = jQuery(this).parents('.scheduleds-number-group');
 				container.find('.phone-hidden-input').val(jQuery(this).intlTelInput("getNumber"));
 			});
-			
+
 			this.submit();
 		});
 	});