diff --git a/screens/Contact/ContactDetailScreen.js b/screens/Contact/ContactDetailScreen.js
index f0cf17ae..25c3a193 100644
--- a/screens/Contact/ContactDetailScreen.js
+++ b/screens/Contact/ContactDetailScreen.js
@@ -365,8 +365,22 @@ const initialState = {
   sources: [],
   nonExistingSources: [],
   unmodifiedSources: [],
-  nonExistingSubassigned: [],
-  unmodifiedSubassigned: [],
+  subAssignedContacts: [],
+  unmodifiedSubAssignedContacts: [],
+  relationContacts: [],
+  unmodifiedRelationContacts: [],
+  baptizedByContacts: [],
+  unmodifiedBaptizedByContacts: [],
+  baptizedContacts: [],
+  unmodifiedBaptizedContacts: [],
+  coachedByContacts: [],
+  unmodifiedCoachedByContacts: [],
+  coachedContacts: [],
+  unmodifiedCoachedContacts: [],
+  connectionGroups: [],
+  unmodifiedConnectionGroups: [],
+  assignedToContacts: [],
+  unmodifedAssignedToContacts: []
 };
 
 const safeFind = (found, prop) => {
@@ -649,37 +663,266 @@ class ContactDetailScreen extends React.Component {
         });
       }
       if (newState.contact.subassigned) {
-        console.log(newState.contact.subassigned);
+
+        // Clear collection
+        newState = {
+          ...newState,
+          subAssignedContacts: []
+        };
+
         newState.contact.subassigned.values.forEach((subassignedContact) => {
           const foundSubassigned = newState.usersContacts.find((user) => user.value === subassignedContact.value);
           if (!foundSubassigned) {
             // Add non existent contact subassigned in subassigned list (user does not have access permission to this contacts)
             newState = {
               ...newState,
-              usersContacts: [
-                ...newState.usersContacts,
+              subAssignedContacts: [
+                ...newState.subAssignedContacts,
                 {
                   name: subassignedContact.name,
                   value: subassignedContact.value
                 }
               ],
-              nonExistingSubassigned: [
-                ...newState.nonExistingSubassigned,
+              unmodifiedSubAssignedContacts: [
+                ...newState.unmodifiedSubAssignedContacts,
                 {
                   name: subassignedContact.name,
-                  value: subassignedContact.value,
-                },
+                  value: subassignedContact.value
+                }
+              ]
+            };
+          }
+        });
+
+      }
+      if (newState.contact.relation) {
+
+        // Clear collection
+        newState = {
+          ...newState,
+          relationContacts: []
+        };
+
+        newState.contact.relation.values.forEach((relationContact) => {
+          const foundRelation = newState.usersContacts.find((user) => user.value === relationContact.value);
+          if (!foundRelation) {
+            // Add non existent contact relation in relation list (user does not have access permission to this contacts)
+            newState = {
+              ...newState,
+              relationContacts: [
+                ...newState.relationContacts,
+                {
+                  name: relationContact.name,
+                  value: relationContact.value
+                }
               ],
-              unmodifiedSubassigned: [
-                ...newState.unmodifiedSubassigned,
+              unmodifiedRelationContacts: [
+                ...newState.unmodifiedRelationContacts,
                 {
-                  name: subassignedContact.name,
-                  value: subassignedContact.value,
-                },
+                  name: relationContact.name,
+                  value: relationContact.value
+                }
+              ]
+            };
+          }
+        });
+
+      }
+      if (newState.contact.baptized_by) {
+
+        // Clear collection
+        newState = {
+          ...newState,
+          baptizedByContacts: []
+        };
+
+        newState.contact.baptized_by.values.forEach((baptizedByContact) => {
+          const foundBaptized = newState.usersContacts.find((user) => user.value === baptizedByContact.value);
+          if (!foundBaptized) {
+            // Add non existent contact relation in relation list (user does not have access permission to this contacts)
+            newState = {
+              ...newState,
+              baptizedByContacts: [
+                ...newState.baptizedByContacts,
+                {
+                  name: baptizedByContact.name,
+                  value: baptizedByContact.value
+                }
               ],
-            }
+              unmodifiedBaptizedByContacts: [
+                ...newState.unmodifiedBaptizedByContacts,
+                {
+                  name: baptizedByContact.name,
+                  value: baptizedByContact.value
+                }
+              ]
+            };
+          }
+        });
+
+      }
+      if (newState.contact.baptized) {
+
+        // Clear collection
+        newState = {
+          ...newState,
+          baptizedContacts: []
+        };
+
+        newState.contact.baptized.values.forEach((baptizedContact) => {
+          const foundBaptized = newState.usersContacts.find((user) => user.value === baptizedContact.value);
+          if (!foundBaptized) {
+            // Add non existent contact baptized to list (user does not have access permission to this contacts)
+            newState = {
+              ...newState,
+              baptizedContacts: [
+                ...newState.baptizedContacts,
+                {
+                  name: baptizedContact.name,
+                  value: baptizedContact.value
+                }
+              ],
+              unmodifiedBaptizedContacts: [
+                ...newState.unmodifiedBaptizedContacts,
+                {
+                  name: baptizedContact.name,
+                  value: baptizedContact.value
+                }
+              ]
+            };
           }
         });
+
+      }
+      if (newState.contact.coached_by) {
+
+        // Clear collection
+        newState = {
+          ...newState,
+          coachedByContacts: []
+        };
+
+        newState.contact.coached_by.values.forEach((coachedByContact) => {
+          const foundcoachedBy = newState.usersContacts.find((user) => user.value === coachedByContact.value);
+          if (!foundcoachedBy) {
+            // Add non existent contact coachedBy to list (user does not have access permission to this contacts)
+            newState = {
+              ...newState,
+              coachedByContacts: [
+                ...newState.coachedByContacts,
+                {
+                  name: coachedByContact.name,
+                  value: coachedByContact.value
+                }
+              ],
+              unmodifiedCoachedByContacts: [
+                ...newState.unmodifiedCoachedByContacts,
+                {
+                  name: coachedByContact.name,
+                  value: coachedByContact.value
+                }
+              ]
+            };
+          }
+        });
+
+      }
+      if (newState.contact.coaching) {
+
+        // Clear collection
+        newState = {
+          ...newState,
+          coachedContacts: []
+        };
+
+        newState.contact.coaching.values.forEach((coachedContact) => {
+          const foundCoached = newState.usersContacts.find((user) => user.value === coachedContact.value);
+          if (!foundCoached) {
+            // Add non existent contact coached to list (user does not have access permission to this contacts)
+            newState = {
+              ...newState,
+              coachedContacts: [
+                ...newState.coachedContacts,
+                {
+                  name: coachedContact.name,
+                  value: coachedContact.value
+                }
+              ],
+              unmodifiedCoachedContacts: [
+                ...newState.unmodifiedCoachedContacts,
+                {
+                  name: coachedContact.name,
+                  value: coachedContact.value
+                }
+              ]
+            };
+          }
+        });
+
+      }
+      if (newState.contact.groups) {
+
+        // Clear collection
+        newState = {
+          ...newState,
+          connectionGroups: []
+        };
+
+        newState.contact.groups.values.forEach((groupConnection) => {
+          const foundGroup = newState.groups.find((group) => group.value === groupConnection.value);
+          if (!foundGroup) {
+            // Add non existent group to list (user does not have access permission to this groups)
+            newState = {
+              ...newState,
+              connectionGroups: [
+                ...newState.connectionGroups,
+                {
+                  name: groupConnection.name,
+                  value: groupConnection.value
+                }
+              ],
+              unmodifiedConnectionGroups: [
+                ...newState.unmodifiedConnectionGroups,
+                {
+                  name: groupConnection.name,
+                  value: groupConnection.value
+                }
+              ]
+            };
+          }
+        });
+
+      }
+      if (newState.contact.assigned_to) {
+
+        // Clear collection
+        newState = {
+          ...newState,
+          assignedToContacts: []
+        };
+
+        let foundAssigned = newState.users.find((user) => user.key === newState.contact.assigned_to.key);
+          if (!foundAssigned) {
+            // Add non existent group to list (user does not have access permission to this groups)
+            newState = {
+              ...newState,
+              assignedToContacts: [
+                ...newState.assignedToContacts,
+                {
+                  label: foundAssigned.label,
+                  key: foundAssigned.key
+                }
+              ],
+              unmodifedAssignedToContacts: [
+                ...newState.unmodifedAssignedToContacts,
+                {
+                  label: foundAssigned.label,
+                  key: foundAssigned.key
+                }
+              ]
+            };
+          }
+
       }
     }
 
@@ -1003,8 +1246,7 @@ class ContactDetailScreen extends React.Component {
       })),
       loadedLocal: true,
       sources: [...sourcesList],
-      unmodifiedSources: [...sourcesList],
-      unmodifiedSubassigned: [...userContactsList]
+      unmodifiedSources: [...sourcesList]
     };
 
     this.setState(newState, () => {
@@ -1072,7 +1314,17 @@ class ContactDetailScreen extends React.Component {
   };
 
   onDisableEdit = () => {
-    const { unmodifiedContact, unmodifiedSources, unmodifiedSubassigned } = this.state;
+    const { unmodifiedContact,
+      unmodifiedSources,
+      unmodifiedSubAssignedContacts,
+      unmodifiedRelationContacts,
+      unmodifiedBaptizedByContacts,
+      unmodifiedBaptizedContacts,
+      unmodifiedCoachedByContacts,
+      unmodifiedCoachedContacts,
+      unmodifiedConnectionGroups,
+      unmodifedAssignedToContacts
+    } = this.state;
     this.setState((state) => {
       const indexFix =
         state.tabViewConfig.index > 1 ? state.tabViewConfig.index + 1 : state.tabViewConfig.index;
@@ -1090,7 +1342,14 @@ class ContactDetailScreen extends React.Component {
           routes: [...tabViewRoutes],
         },
         sources: [...unmodifiedSources],
-        usersContacts: [...unmodifiedSubassigned]
+        subAssignedContacts: [...unmodifiedSubAssignedContacts],
+        relationContacts: [...unmodifiedRelationContacts],
+        baptizedByContacts: [...unmodifiedBaptizedByContacts],
+        baptizedContacts: [...unmodifiedBaptizedContacts],
+        coachedByContacts: [...unmodifiedCoachedByContacts],
+        coachedContacts: [...unmodifiedCoachedContacts],
+        connectionGroups: [...unmodifiedConnectionGroups],
+        assignedToContacts: [...unmodifedAssignedToContacts]
       };
     });
     this.props.navigation.setParams({ hideTabBar: false, onlyView: true });
@@ -1269,6 +1528,12 @@ class ContactDetailScreen extends React.Component {
               ID: this.state.contact.ID,
             };
           }
+          if(contactToSave.assigned_to) {
+            contactToSave = {
+              ...contactToSave,
+              assigned_to: `user-${contactToSave.assigned_to.key}`,
+            };
+          }
           this.props.saveContact(
             this.props.userData.domain,
             this.props.userData.token,
@@ -1558,7 +1823,7 @@ class ContactDetailScreen extends React.Component {
                 <Col style={[styles.formIconLabel, { marginRight: 10 }]}>
                   <Icon type="FontAwesome" name="user-circle" style={styles.formIcon} />
                 </Col>
-                <Col>{this.showAssignedUser()}</Col>
+                <Col>{(this.state.contact.assigned_to) ? this.showAssignedUser() : null}</Col>
                 <Col style={styles.formParentLabel}>
                   <Label style={styles.formLabel}>
                     {this.props.contactSettings.fields.assigned_to.name}
@@ -2027,12 +2292,10 @@ class ContactDetailScreen extends React.Component {
                   <Col style={[styles.contactTextRoundField, { paddingRight: 10 }]}>
                     <Picker
                       selectedValue={
-                        this.state.contact.assigned_to
-                          ? parseInt(this.state.contact.assigned_to.replace('user-', ''))
-                          : ''
+                        this.state.contact.assigned_to ? this.state.contact.assigned_to.key : null
                       }
                       onValueChange={this.onSelectAssignedTo}>
-                      {this.renderPickerItems(this.state.users)}
+                      {this.renderPickerItems([...this.state.users, ...this.state.assignedToContacts])}
                     </Picker>
                   </Col>
                 </Row>
@@ -2065,10 +2328,10 @@ class ContactDetailScreen extends React.Component {
                       subAssignedSelectizeRef = selectize;
                     }}
                     itemId="value"
-                    items={this.state.usersContacts}
+                    items={[...this.state.subAssignedContacts, ...this.state.usersContacts]}
                     selectedItems={this.getSelectizeItems(
                       this.state.contact.subassigned,
-                      this.state.usersContacts,
+                      [...this.state.subAssignedContacts, ...this.state.usersContacts],
                     )}
                     textInputProps={{
                       placeholder: i18n.t('contactDetailScreen.subAssignThisContact'),
@@ -2078,19 +2341,15 @@ class ContactDetailScreen extends React.Component {
                         key={id}
                         iconStyle={iconStyle}
                         onClose={(props) => {
-                          const nonExistingSsubassignedList = [...this.state.nonExistingSubassigned];
-                          let foundNonExistingSubassigned = nonExistingSsubassignedList.findIndex(
-                            (subassigned) => subassigned.value === id,
+                          let foundSubassignedIndex = this.state.subAssignedContacts.findIndex(
+                            (subassigned) => subassigned.value === id
                           );
-                          if (foundNonExistingSubassigned > -1) {
-                            // Remove subassigned from select list
-                            const usersContactsList = [...this.state.usersContacts];
-                            let foundSubassignIndex = usersContactsList.findIndex(
-                              (subassigned) => subassigned.value === id,
-                            );
-                            usersContactsList.splice(foundSubassignIndex, 1);
+                          if (foundSubassignedIndex > -1) {
+                            // Remove subassigned from list
+                            const subAssignedContacts = [...this.state.subAssignedContacts];
+                            subAssignedContacts.splice(foundSubassignedIndex, 1);
                             this.setState({
-                              usersContacts: [...usersContactsList],
+                              subAssignedContacts: [...subAssignedContacts],
                             });
                           }
                           onClose(props);
@@ -3083,28 +3342,15 @@ class ContactDetailScreen extends React.Component {
                     ]}>
                     {this.state.contact.groups ? (
                       this.state.contact.groups.values.map((group, index) =>
-                        safeFind(
-                          this.state.groups.find((groupItem) => groupItem.value === group.value),
-                          'name',
-                        ).length > 0 ? (
-                            <TouchableOpacity
-                              key={index.toString()}
-                              activeOpacity={0.5}
-                              onPress={() => this.goToGroupDetailScreen(group.value)}>
-                              <Text style={styles.linkingText}>
-                                {safeFind(
-                                  this.state.groups.find(
-                                    (groupItem) => groupItem.value === group.value,
-                                  ),
-                                  'name',
-                                )}
-                              </Text>
-                            </TouchableOpacity>
-                          ) : (
-                            <Text></Text>
-                          ),
-                      )
-                    ) : (
+                        <TouchableOpacity
+                          key={index.toString()}
+                          activeOpacity={0.5}
+                          onPress={() => this.goToGroupDetailScreen(group.value)}>
+                          <Text style={styles.linkingText}>
+                            {group.name}
+                          </Text>
+                        </TouchableOpacity>
+                      )) : (
                         <Text></Text>
                       )}
                   </View>
@@ -3127,31 +3373,16 @@ class ContactDetailScreen extends React.Component {
                       this.props.isRTL ? { textAlign: 'left', flex: 1 } : {},
                     ]}>
                     {this.state.contact.relation ? (
-                      this.state.contact.relation.values.map((relation, index) =>
-                        safeFind(
-                          this.state.usersContacts.find(
-                            (userItem) => userItem.value === relation.value,
-                          ),
-                          'name',
-                        ).length > 0 ? (
-                            <TouchableOpacity
-                              key={index.toString()}
-                              activeOpacity={0.5}
-                              onPress={() => this.goToContactDetailScreen(relation.value)}>
-                              <Text style={styles.linkingText}>
-                                {safeFind(
-                                  this.state.usersContacts.find(
-                                    (userItem) => userItem.value === relation.value,
-                                  ),
-                                  'name',
-                                )}
-                              </Text>
-                            </TouchableOpacity>
-                          ) : (
-                            <Text></Text>
-                          ),
-                      )
-                    ) : (
+                      this.state.contact.relation.values.map((contact, index) =>
+                        <TouchableOpacity
+                          key={index.toString()}
+                          activeOpacity={0.5}
+                          onPress={() => this.goToContactDetailScreen(contact.value)}>
+                          <Text style={styles.linkingText}>
+                            {contact.name}
+                          </Text>
+                        </TouchableOpacity>
+                      )) : (
                         <Text></Text>
                       )}
                   </View>
@@ -3174,31 +3405,16 @@ class ContactDetailScreen extends React.Component {
                       this.props.isRTL ? { textAlign: 'left', flex: 1 } : {},
                     ]}>
                     {this.state.contact.baptized_by ? (
-                      this.state.contact.baptized_by.values.map((baptizedBy, index) =>
-                        safeFind(
-                          this.state.usersContacts.find(
-                            (userItem) => userItem.value === baptizedBy.value,
-                          ),
-                          'name',
-                        ).length > 0 ? (
-                            <TouchableOpacity
-                              key={index.toString()}
-                              activeOpacity={0.5}
-                              onPress={() => this.goToContactDetailScreen(baptizedBy.value)}>
-                              <Text style={styles.linkingText}>
-                                {safeFind(
-                                  this.state.usersContacts.find(
-                                    (userItem) => userItem.value === baptizedBy.value,
-                                  ),
-                                  'name',
-                                )}
-                              </Text>
-                            </TouchableOpacity>
-                          ) : (
-                            <Text></Text>
-                          ),
-                      )
-                    ) : (
+                      this.state.contact.baptized_by.values.map((contact, index) =>
+                        <TouchableOpacity
+                          key={index.toString()}
+                          activeOpacity={0.5}
+                          onPress={() => this.goToContactDetailScreen(contact.value)}>
+                          <Text style={styles.linkingText}>
+                            {contact.name}
+                          </Text>
+                        </TouchableOpacity>
+                      )) : (
                         <Text></Text>
                       )}
                   </View>
@@ -3225,31 +3441,16 @@ class ContactDetailScreen extends React.Component {
                       this.props.isRTL ? { textAlign: 'left', flex: 1 } : {},
                     ]}>
                     {this.state.contact.baptized ? (
-                      this.state.contact.baptized.values.map((baptized, index) =>
-                        safeFind(
-                          this.state.usersContacts.find(
-                            (userItem) => userItem.value === baptized.value,
-                          ),
-                          'name',
-                        ).length > 0 ? (
-                            <TouchableOpacity
-                              key={index.toString()}
-                              activeOpacity={0.5}
-                              onPress={() => this.goToContactDetailScreen(baptized.value)}>
-                              <Text style={styles.linkingText}>
-                                {safeFind(
-                                  this.state.usersContacts.find(
-                                    (userItem) => userItem.value === baptized.value,
-                                  ),
-                                  'name',
-                                )}
-                              </Text>
-                            </TouchableOpacity>
-                          ) : (
-                            <Text></Text>
-                          ),
-                      )
-                    ) : (
+                      this.state.contact.baptized.values.map((contact, index) =>
+                        <TouchableOpacity
+                          key={index.toString()}
+                          activeOpacity={0.5}
+                          onPress={() => this.goToContactDetailScreen(contact.value)}>
+                          <Text style={styles.linkingText}>
+                            {contact.name}
+                          </Text>
+                        </TouchableOpacity>
+                      )) : (
                         <Text></Text>
                       )}
                   </View>
@@ -3276,31 +3477,16 @@ class ContactDetailScreen extends React.Component {
                       this.props.isRTL ? { textAlign: 'left', flex: 1 } : {},
                     ]}>
                     {this.state.contact.coached_by ? (
-                      this.state.contact.coached_by.values.map((coachedBy, index) =>
-                        safeFind(
-                          this.state.usersContacts.find(
-                            (userItem) => userItem.value === coachedBy.value,
-                          ),
-                          'name',
-                        ).length > 0 ? (
-                            <TouchableOpacity
-                              key={index.toString()}
-                              activeOpacity={0.5}
-                              onPress={() => this.goToContactDetailScreen(coachedBy.value)}>
-                              <Text style={styles.linkingText}>
-                                {safeFind(
-                                  this.state.usersContacts.find(
-                                    (userItem) => userItem.value === coachedBy.value,
-                                  ),
-                                  'name',
-                                )}
-                              </Text>
-                            </TouchableOpacity>
-                          ) : (
-                            <Text></Text>
-                          ),
-                      )
-                    ) : (
+                      this.state.contact.coached_by.values.map((contact, index) =>
+                        <TouchableOpacity
+                          key={index.toString()}
+                          activeOpacity={0.5}
+                          onPress={() => this.goToContactDetailScreen(contact.value)}>
+                          <Text style={styles.linkingText}>
+                            {contact.name}
+                          </Text>
+                        </TouchableOpacity>
+                      )) : (
                         <Text></Text>
                       )}
                   </View>
@@ -3327,31 +3513,16 @@ class ContactDetailScreen extends React.Component {
                       this.props.isRTL ? { textAlign: 'left', flex: 1 } : {},
                     ]}>
                     {this.state.contact.coaching ? (
-                      this.state.contact.coaching.values.map((coaching, index) =>
-                        safeFind(
-                          this.state.usersContacts.find(
-                            (userItem) => userItem.value === coaching.value,
-                          ),
-                          'name',
-                        ).length > 0 ? (
-                            <TouchableOpacity
-                              key={index.toString()}
-                              activeOpacity={0.5}
-                              onPress={() => this.goToContactDetailScreen(coaching.value)}>
-                              <Text style={styles.linkingText}>
-                                {safeFind(
-                                  this.state.usersContacts.find(
-                                    (userItem) => userItem.value === coaching.value,
-                                  ),
-                                  'name',
-                                )}
-                              </Text>
-                            </TouchableOpacity>
-                          ) : (
-                            <Text></Text>
-                          ),
-                      )
-                    ) : (
+                      this.state.contact.coaching.values.map((contact, index) =>
+                        <TouchableOpacity
+                          key={index.toString()}
+                          activeOpacity={0.5}
+                          onPress={() => this.goToContactDetailScreen(contact.value)}>
+                          <Text style={styles.linkingText}>
+                            {contact.name}
+                          </Text>
+                        </TouchableOpacity>
+                      )) : (
                         <Text></Text>
                       )}
                   </View>
@@ -3402,10 +3573,10 @@ class ContactDetailScreen extends React.Component {
                       groupsSelectizeRef = selectize;
                     }}
                     itemId="value"
-                    items={this.state.groups}
+                    items={[...this.state.connectionGroups, ...this.state.groups]}
                     selectedItems={this.getSelectizeItems(
                       this.state.contact.groups,
-                      this.state.groups,
+                      [...this.state.connectionGroups, ...this.state.groups],
                     )}
                     textInputProps={{
                       placeholder: i18n.t('contactDetailScreen.addGroup'),
@@ -3448,7 +3619,20 @@ class ContactDetailScreen extends React.Component {
                       <Chip
                         key={id}
                         iconStyle={iconStyle}
-                        onClose={onClose}
+                        onClose={(props) => {
+                          let foundGroupIndex = this.state.connectionGroups.findIndex(
+                            (groupConnection) => groupConnection.value === id
+                          );
+                          if (foundGroupIndex > -1) {
+                            // Remove group from list
+                            const connectionGroups = [...this.state.connectionGroups];
+                            connectionGroups.splice(foundGroupIndex, 1);
+                            this.setState({
+                              connectionGroups: [...connectionGroups],
+                            });
+                          }
+                          onClose(props);
+                        }}
                         text={item.name}
                         style={style}
                       />
@@ -3486,10 +3670,10 @@ class ContactDetailScreen extends React.Component {
                       connectionsSelectizeRef = selectize;
                     }}
                     itemId="value"
-                    items={this.state.usersContacts}
+                    items={[...this.state.relationContacts, ...this.state.usersContacts]}
                     selectedItems={this.getSelectizeItems(
                       this.state.contact.relation,
-                      this.state.usersContacts,
+                      [...this.state.relationContacts, ...this.state.usersContacts],
                     )}
                     textInputProps={{
                       placeholder: i18n.t('contactDetailScreen.addConnection'),
@@ -3532,7 +3716,20 @@ class ContactDetailScreen extends React.Component {
                       <Chip
                         key={id}
                         iconStyle={iconStyle}
-                        onClose={onClose}
+                        onClose={(props) => {
+                          let foundRelationIndex = this.state.relationContacts.findIndex(
+                            (relation) => relation.value === id
+                          );
+                          if (foundRelationIndex > -1) {
+                            // Remove relation from list
+                            const relationContacts = [...this.state.relationContacts];
+                            relationContacts.splice(foundRelationIndex, 1);
+                            this.setState({
+                              relationContacts: [...relationContacts],
+                            });
+                          }
+                          onClose(props);
+                        }}
                         text={item.name}
                         style={style}
                       />
@@ -3570,10 +3767,10 @@ class ContactDetailScreen extends React.Component {
                       baptizedBySelectizeRef = selectize;
                     }}
                     itemId="value"
-                    items={this.state.usersContacts}
+                    items={[...this.state.baptizedByContacts, ...this.state.usersContacts]}
                     selectedItems={this.getSelectizeItems(
                       this.state.contact.baptized_by,
-                      this.state.usersContacts,
+                      [...this.state.baptizedByContacts, ...this.state.usersContacts],
                     )}
                     textInputProps={{
                       placeholder: i18n.t('contactDetailScreen.addBaptizedBy'),
@@ -3616,7 +3813,20 @@ class ContactDetailScreen extends React.Component {
                       <Chip
                         key={id}
                         iconStyle={iconStyle}
-                        onClose={onClose}
+                        onClose={(props) => {
+                          let foundBaptizedByIndex = this.state.baptizedByContacts.findIndex(
+                            (baptized) => baptized.value === id
+                          );
+                          if (foundBaptizedByIndex > -1) {
+                            // Remove baptized from list
+                            const baptizedByContacts = [...this.state.baptizedByContacts];
+                            baptizedByContacts.splice(foundBaptizedByIndex, 1);
+                            this.setState({
+                              baptizedByContacts: [...baptizedByContacts],
+                            });
+                          }
+                          onClose(props);
+                        }}
                         text={item.name}
                         style={style}
                       />
@@ -3654,10 +3864,10 @@ class ContactDetailScreen extends React.Component {
                       baptizedSelectizeRef = selectize;
                     }}
                     itemId="value"
-                    items={this.state.usersContacts}
+                    items={[...this.state.baptizedContacts, ...this.state.usersContacts]}
                     selectedItems={this.getSelectizeItems(
                       this.state.contact.baptized,
-                      this.state.usersContacts,
+                      [...this.state.baptizedContacts, ...this.state.usersContacts],
                     )}
                     textInputProps={{
                       placeholder: i18n.t('contactDetailScreen.addBaptized'),
@@ -3700,7 +3910,20 @@ class ContactDetailScreen extends React.Component {
                       <Chip
                         key={id}
                         iconStyle={iconStyle}
-                        onClose={onClose}
+                        onClose={(props) => {
+                          let foundBaptizedIndex = this.state.baptizedContacts.findIndex(
+                            (baptized) => baptized.value === id
+                          );
+                          if (foundBaptizedIndex > -1) {
+                            // Remove baptized from list
+                            const baptizedContacts = [...this.state.baptizedContacts];
+                            baptizedContacts.splice(foundBaptizedIndex, 1);
+                            this.setState({
+                              baptizedContacts: [...baptizedContacts],
+                            });
+                          }
+                          onClose(props);
+                        }}
                         text={item.name}
                         style={style}
                       />
@@ -3738,10 +3961,10 @@ class ContactDetailScreen extends React.Component {
                       coachedSelectizeRef = selectize;
                     }}
                     itemId="value"
-                    items={this.state.usersContacts}
+                    items={[...this.state.coachedByContacts, ...this.state.usersContacts]}
                     selectedItems={this.getSelectizeItems(
                       this.state.contact.coached_by,
-                      this.state.usersContacts,
+                      [...this.state.coachedByContacts, ...this.state.usersContacts],
                     )}
                     textInputProps={{
                       placeholder: i18n.t('contactDetailScreen.addCoachedBy'),
@@ -3784,7 +4007,20 @@ class ContactDetailScreen extends React.Component {
                       <Chip
                         key={id}
                         iconStyle={iconStyle}
-                        onClose={onClose}
+                        onClose={(props) => {
+                          let foundCoachedByIndex = this.state.coachedByContacts.findIndex(
+                            (coachedBy) => coachedBy.value === id
+                          );
+                          if (foundCoachedByIndex > -1) {
+                            // Remove coachedBy from list
+                            const coachedByContacts = [...this.state.coachedByContacts];
+                            coachedByContacts.splice(foundCoachedByIndex, 1);
+                            this.setState({
+                              coachedByContacts: [...coachedByContacts],
+                            });
+                          }
+                          onClose(props);
+                        }}
                         text={item.name}
                         style={style}
                       />
@@ -3822,10 +4058,10 @@ class ContactDetailScreen extends React.Component {
                       coachingSelectizeRef = selectize;
                     }}
                     itemId="value"
-                    items={this.state.usersContacts}
+                    items={[...this.state.coachedContacts, ...this.state.usersContacts]}
                     selectedItems={this.getSelectizeItems(
                       this.state.contact.coaching,
-                      this.state.usersContacts,
+                      [...this.state.coachedContacts, ...this.state.usersContacts],
                     )}
                     textInputProps={{
                       placeholder: i18n.t('contactDetailScreen.addCoaching'),
@@ -3868,7 +4104,20 @@ class ContactDetailScreen extends React.Component {
                       <Chip
                         key={id}
                         iconStyle={iconStyle}
-                        onClose={onClose}
+                        onClose={(props) => {
+                          let foundCoachedIndex = this.state.coachedContacts.findIndex(
+                            (coached) => coached.value === id
+                          );
+                          if (foundCoachedIndex > -1) {
+                            // Remove coached from list
+                            const coachedContacts = [...this.state.coachedContacts];
+                            coachedContacts.splice(foundCoachedIndex, 1);
+                            this.setState({
+                              coachedContacts: [...coachedContacts],
+                            });
+                          }
+                          onClose(props);
+                        }}
                         text={item.name}
                         style={style}
                       />
@@ -4341,9 +4590,15 @@ class ContactDetailScreen extends React.Component {
     this.setState((prevState) => ({
       contact: {
         ...prevState.contact,
-        assigned_to: `user-${value}`,
+        assigned_to: {
+          key: value,
+          label: [...this.state.users, ...this.state.assignedToContacts].find(
+            (user) => user.key === value,
+          ).label
+        },
       },
       showAssignedToModal: false,
+      assignedToContacts: [] // Clear non existing assigentToContacts list
     }));
   };
 
@@ -4354,8 +4609,8 @@ class ContactDetailScreen extends React.Component {
   };
 
   showAssignedUser = () => {
-    const foundUser = this.state.users.find(
-      (user) => `user-${user.key}` === this.state.contact.assigned_to,
+    const foundUser = [...this.state.users, ...this.state.assignedToContacts].find(
+      (user) => user.key === this.state.contact.assigned_to.key,
     );
     return (
       <Text
@@ -4363,7 +4618,7 @@ class ContactDetailScreen extends React.Component {
           { marginTop: 'auto', marginBottom: 'auto', fontSize: 15 },
           this.props.isRTL ? { textAlign: 'left', flex: 1 } : {},
         ]}>
-        {foundUser ? foundUser.label : ''}
+        {foundUser.label}
       </Text>
     );
   };
@@ -5745,8 +6000,8 @@ ContactDetailScreen.propTypes = {
         }),
       }),
       assigned_to: PropTypes.shape({
-        name: PropTypes.string,
-        values: PropTypes.shape({}),
+        key: PropTypes.number,
+        label: PropTypes.string,
       }),
       subassigned: PropTypes.shape({
         name: PropTypes.string,
diff --git a/screens/Group/GroupDetailScreen.js b/screens/Group/GroupDetailScreen.js
index ff0c6d12..7b3baae6 100644
--- a/screens/Group/GroupDetailScreen.js
+++ b/screens/Group/GroupDetailScreen.js
@@ -500,6 +500,18 @@ const initialState = {
   keyword: '',
   suggestedUsers: [],
   height: sharedTools.commentFieldMinHeight,
+  groupCoachContacts: [],
+  unmodifiedGroupCoachContacts: [],
+  parentGroups: [],
+  unmodifiedParentGroups: [],
+  peerGroups: [],
+  unmodifiedPeerGroups: [],
+  childGroups: [],
+  unmodifiedChildGroups: [],
+  membersContacts: [],
+  unmodifiedMembersContacts: [],
+  assignedToContacts: [],
+  unmodifedAssignedToContacts: []
 };
 
 const safeFind = (found, prop) => {
@@ -779,6 +791,202 @@ class GroupDetailScreen extends React.Component {
           updateMembersList: !newState.updateMembersList,
         };
       }
+      if (newState.group.coaches) {
+
+        // Clear collection
+        newState = {
+          ...newState,
+          groupCoachContacts: []
+        };
+
+        newState.group.coaches.values.forEach((coachContact) => {
+          const foundCoachContact = newState.usersContacts.find((user) => user.value === coachContact.value);
+          if (!foundCoachContact) {
+            // Add non existent coach contact in usersContacts list (user does not have access permission to this contacts)
+            newState = {
+              ...newState,
+              groupCoachContacts: [
+                ...newState.groupCoachContacts,
+                {
+                  name: coachContact.name,
+                  value: coachContact.value
+                }
+              ],
+              unmodifiedGroupCoachContacts: [
+                ...newState.unmodifiedGroupCoachContacts,
+                {
+                  name: coachContact.name,
+                  value: coachContact.value
+                }
+              ]
+            };
+          }
+        });
+
+      }
+      if (newState.group.parent_groups) {
+
+        // Clear collection
+        newState = {
+          ...newState,
+          parentGroups: []
+        };
+
+        newState.group.parent_groups.values.forEach((parentGroup) => {
+          const foundParentGroup = newState.groups.find((groups) => groups.value === parentGroup.value);
+          if (!foundParentGroup) {
+            // Add non existent parent group in groups list (user does not have access permission to this group/s)
+            newState = {
+              ...newState,
+              parentGroups: [
+                ...newState.parentGroups,
+                {
+                  name: parentGroup.name,
+                  value: parentGroup.value
+                }
+              ],
+              unmodifiedParentGroups: [
+                ...newState.unmodifiedParentGroups,
+                {
+                  name: parentGroup.name,
+                  value: parentGroup.value
+                }
+              ]
+            };
+          }
+        });
+
+      }
+      if (newState.group.peer_groups) {
+
+        // Clear collection
+        newState = {
+          ...newState,
+          peerGroups: []
+        };
+
+        newState.group.peer_groups.values.forEach((peerGroup) => {
+          const foundPeerGroup = newState.groups.find((groups) => groups.value === peerGroup.value);
+          if (!foundPeerGroup) {
+            // Add non existent peer group in groups list (user does not have access permission to this group/s)
+            newState = {
+              ...newState,
+              peerGroups: [
+                ...newState.peerGroups,
+                {
+                  name: peerGroup.name,
+                  value: peerGroup.value
+                }
+              ],
+              unmodifiedPeerGroups: [
+                ...newState.unmodifiedPeerGroups,
+                {
+                  name: peerGroup.name,
+                  value: peerGroup.value
+                }
+              ]
+            };
+          }
+        });
+
+      }
+      if (newState.group.child_groups) {
+
+        // Clear collection
+        newState = {
+          ...newState,
+          childGroups: []
+        };
+
+        newState.group.child_groups.values.forEach((childGroup) => {
+          const foundChildGroup = newState.groups.find((groups) => groups.value === childGroup.value);
+          if (!foundChildGroup) {
+            // Add non existent child group in groups list (user does not have access permission to this group/s)
+            newState = {
+              ...newState,
+              childGroups: [
+                ...newState.childGroups,
+                {
+                  name: childGroup.name,
+                  value: childGroup.value
+                }
+              ],
+              unmodifiedChildGroups: [
+                ...newState.unmodifiedChildGroups,
+                {
+                  name: childGroup.name,
+                  value: childGroup.value
+                }
+              ]
+            };
+          }
+        });
+
+      }
+      if (newState.group.members) {
+
+        // Clear collection
+        newState = {
+          ...newState,
+          membersContacts: []
+        };
+
+        newState.group.members.values.forEach((member) => {
+          const foundMember = newState.usersContacts.find((contact) => contact.value === member.value);
+          if (!foundMember) {
+            // Add non existent member contact in members list (user does not have access permission to this contact/s)
+            newState = {
+              ...newState,
+              membersContacts: [
+                ...newState.membersContacts,
+                {
+                  name: member.name,
+                  value: member.value
+                }
+              ],
+              unmodifiedMembersContacts: [
+                ...newState.unmodifiedMembersContacts,
+                {
+                  name: member.name,
+                  value: member.value
+                }
+              ]
+            };
+          }
+        });
+
+      }
+      if (newState.group.assigned_to) {
+
+        // Clear collection
+        newState = {
+          ...newState,
+          assignedToContacts: []
+        };
+
+        let foundAssigned = newState.users.find((user) => user.key === newState.group.assigned_to.key);
+        if (!foundAssigned) {
+          // Add non existent group to list (user does not have access permission to this groups)
+          newState = {
+            ...newState,
+            assignedToContacts: [
+              ...newState.assignedToContacts,
+              {
+                label: foundAssigned.label,
+                key: foundAssigned.key
+              }
+            ],
+            unmodifedAssignedToContacts: [
+              ...newState.unmodifedAssignedToContacts,
+              {
+                label: foundAssigned.label,
+                key: foundAssigned.key
+              }
+            ]
+          };
+        }
+
+      }
     }
 
     // GET COMMENTS
@@ -1147,7 +1355,15 @@ class GroupDetailScreen extends React.Component {
   };
 
   onDisableEdit = () => {
-    const { unmodifiedGroup } = this.state;
+    const {
+      unmodifiedGroup,
+      unmodifiedGroupCoachContacts,
+      unmodifiedParentGroups,
+      unmodifiedPeerGroups,
+      unmodifiedChildGroups,
+      unmodifiedMembersContacts,
+      unmodifedAssignedToContacts
+    } = this.state;
     this.setState((state) => {
       const indexFix =
         state.tabViewConfig.index > 1 ? state.tabViewConfig.index + 1 : state.tabViewConfig.index;
@@ -1162,6 +1378,12 @@ class GroupDetailScreen extends React.Component {
           index: indexFix,
           routes: [...tabViewRoutes],
         },
+        groupCoachContacts: [...unmodifiedGroupCoachContacts],
+        parentGroups: [...unmodifiedParentGroups],
+        peerGroups: [...unmodifiedPeerGroups],
+        childGroups: [...unmodifiedChildGroups],
+        membersContacts: [...unmodifiedMembersContacts],
+        assignedToContacts: [...unmodifedAssignedToContacts]
       };
     });
     this.props.navigation.setParams({ hideTabBar: false, onlyView: true });
@@ -1384,9 +1606,15 @@ class GroupDetailScreen extends React.Component {
     this.setState((prevState) => ({
       group: {
         ...prevState.group,
-        assigned_to: `user-${value}`,
+        assigned_to: {
+          key: value,
+          label: [...this.state.users, ...this.state.assignedToContacts].find(
+            (user) => user.key === value,
+          ).label
+        },
       },
       showAssignedToModal: false,
+      assignedToContacts: [] // Clear non existing assigentToContacts list
     }));
   };
 
@@ -1536,6 +1764,13 @@ class GroupDetailScreen extends React.Component {
       let membersListCopy = [...this.state.group.members.values];
       const foundMemberIndex = membersListCopy.indexOf(foundMember);
       membersListCopy.splice(foundMemberIndex, 1);
+      let foundMemberContactIndex = this.state.membersContacts.findIndex(
+        (memberContact) => memberContact.value === selectedValue.value
+      );
+      let membersContacts = [...this.state.membersContacts];
+      if (foundMemberContactIndex > -1) {
+        membersContacts.splice(foundMemberContactIndex, 1);
+      }
       this.setState((prevState) => ({
         group: {
           ...prevState.group,
@@ -1543,6 +1778,8 @@ class GroupDetailScreen extends React.Component {
             values: [...membersListCopy],
           },
         },
+        // Remove member contact from list
+        membersContacts: membersContacts
       }));
     }
   };
@@ -1714,6 +1951,12 @@ class GroupDetailScreen extends React.Component {
               ID: this.state.group.ID,
             };
           }
+          if (groupToSave.assigned_to) {
+            groupToSave = {
+              ...groupToSave,
+              assigned_to: `user-${groupToSave.assigned_to.key}`,
+            };
+          }
           this.props.saveGroup(this.props.userData.domain, this.props.userData.token, groupToSave);
         } else {
           //Empty contact title/name
@@ -1759,16 +2002,16 @@ class GroupDetailScreen extends React.Component {
   };
 
   showAssignedUser = () => {
-    const foundUser = this.state.group.assigned_to
-      ? this.state.users.find((user) => `user-${user.key}` === this.state.group.assigned_to)
-      : null;
+    const foundUser = [...this.state.users, ...this.state.assignedToContacts].find(
+      (user) => user.key === this.state.group.assigned_to.key,
+    );
     return (
       <Text
         style={[
           { marginTop: 'auto', marginBottom: 'auto', fontSize: 15 },
           this.props.isRTL ? { textAlign: 'left', flex: 1 } : {},
         ]}>
-        {foundUser ? foundUser.label : ''}
+        {foundUser.label}
       </Text>
     );
   };
@@ -1896,7 +2139,7 @@ class GroupDetailScreen extends React.Component {
                 <Col style={[styles.formIconLabel, { marginRight: 10 }]}>
                   <Icon type="FontAwesome" name="user-circle" style={styles.formIcon} />
                 </Col>
-                <Col>{this.showAssignedUser()}</Col>
+                <Col>{(this.state.group.assigned_to) ? this.showAssignedUser() : null}</Col>
                 <Col style={styles.formParentLabel}>
                   <Label style={styles.formLabel}>
                     {this.props.groupSettings.fields.assigned_to.name}
@@ -1919,27 +2162,16 @@ class GroupDetailScreen extends React.Component {
                       this.props.isRTL ? { textAlign: 'left', flex: 1 } : {},
                     ]}>
                     {this.state.group.coaches ? (
-                      this.state.group.coaches.values.map((coach, index) =>
-                        safeFind(
-                          this.state.usersContacts.find((user) => user.value === coach.value),
-                          'name',
-                        ).length > 0 ? (
-                            <TouchableOpacity
-                              key={index.toString()}
-                              activeOpacity={0.5}
-                              onPress={() => this.goToContactDetailScreen(coach.value)}>
-                              <Text style={styles.linkingText}>
-                                {safeFind(
-                                  this.state.usersContacts.find((user) => user.value === coach.value),
-                                  'name',
-                                )}
-                              </Text>
-                            </TouchableOpacity>
-                          ) : (
-                            <Text></Text>
-                          ),
-                      )
-                    ) : (
+                      this.state.group.coaches.values.map((contact, index) =>
+                        <TouchableOpacity
+                          key={index.toString()}
+                          activeOpacity={0.5}
+                          onPress={() => this.goToContactDetailScreen(contact.value)}>
+                          <Text style={styles.linkingText}>
+                            {contact.name}
+                          </Text>
+                        </TouchableOpacity>
+                      )) : (
                         <Text></Text>
                       )}
                   </View>
@@ -2229,12 +2461,10 @@ class GroupDetailScreen extends React.Component {
                   <Col style={[styles.groupTextRoundField, { paddingRight: 10 }]}>
                     <Picker
                       selectedValue={
-                        this.state.group.assigned_to
-                          ? parseInt(this.state.group.assigned_to.replace('user-', ''))
-                          : ''
+                        this.state.group.assigned_to ? this.state.group.assigned_to.key : null
                       }
                       onValueChange={this.onSelectAssignedTo}>
-                      {this.renderPickerItems(this.state.users)}
+                      {this.renderPickerItems([...this.state.users, ...this.state.assignedToContacts])}
                     </Picker>
                   </Col>
                 </Row>
@@ -2267,10 +2497,10 @@ class GroupDetailScreen extends React.Component {
                       coachesSelectizeRef = selectize;
                     }}
                     itemId="value"
-                    items={this.state.usersContacts}
+                    items={[...this.state.groupCoachContacts, ...this.state.usersContacts]}
                     selectedItems={this.getSelectizeItems(
                       this.state.group.coaches,
-                      this.state.usersContacts,
+                      [...this.state.groupCoachContacts, ...this.state.usersContacts],
                     )}
                     textInputProps={{
                       placeholder: i18n.t('groupDetailScreen.selectCoaches'),
@@ -2313,7 +2543,20 @@ class GroupDetailScreen extends React.Component {
                       <Chip
                         key={id}
                         iconStyle={iconStyle}
-                        onClose={onClose}
+                        onClose={(props) => {
+                          let foundCoachIndex = this.state.groupCoachContacts.findIndex(
+                            (coach) => coach.value === id
+                          );
+                          if (foundCoachIndex > -1) {
+                            // Remove coach from list
+                            const groupCoachContacts = [...this.state.groupCoachContacts];
+                            groupCoachContacts.splice(foundCoachIndex, 1);
+                            this.setState({
+                              groupCoachContacts: [...groupCoachContacts],
+                            });
+                          }
+                          onClose(props);
+                        }}
                         text={item.name}
                         style={style}
                       />
@@ -3037,7 +3280,7 @@ class GroupDetailScreen extends React.Component {
                         addMembersSelectizeRef = selectize;
                       }}
                       itemId="value"
-                      items={this.state.usersContacts.filter(
+                      items={[...this.state.membersContacts, ...this.state.usersContacts].filter(
                         (userContact) =>
                           this.state.group.members &&
                           !this.state.group.members.values.find(
@@ -3138,7 +3381,7 @@ class GroupDetailScreen extends React.Component {
                           )}
                         <Image source={swimmingPoolIcon} style={styles.groupCenterIcon} />
                         <Row style={styles.groupCircleName}>
-                          <Text style={styles.groupCircleNameText}>{parentGroup.post_title}</Text>
+                          <Text style={styles.groupCircleNameText}>{parentGroup.name}</Text>
                         </Row>
                         <Row style={styles.groupCircleCounter}>
                           <Text>{parentGroup.baptized_member_count}</Text>
@@ -3183,7 +3426,7 @@ class GroupDetailScreen extends React.Component {
                           )}
                         <Image source={swimmingPoolIcon} style={styles.groupCenterIcon} />
                         <Row style={styles.groupCircleName}>
-                          <Text style={styles.groupCircleNameText}>{peerGroup.post_title}</Text>
+                          <Text style={styles.groupCircleNameText}>{peerGroup.name}</Text>
                         </Row>
                         <Row style={styles.groupCircleCounter}>
                           <Text>{peerGroup.baptized_member_count}</Text>
@@ -3226,7 +3469,7 @@ class GroupDetailScreen extends React.Component {
                           )}
                         <Image source={swimmingPoolIcon} style={styles.groupCenterIcon} />
                         <Row style={styles.groupCircleName}>
-                          <Text style={styles.groupCircleNameText}>{childGroup.post_title}</Text>
+                          <Text style={styles.groupCircleNameText}>{childGroup.name}</Text>
                         </Row>
                         <Row style={styles.groupCircleCounter}>
                           <Text>{childGroup.baptized_member_count}</Text>
@@ -3277,10 +3520,10 @@ class GroupDetailScreen extends React.Component {
                       parentGroupsSelectizeRef = selectize;
                     }}
                     itemId="value"
-                    items={this.state.groups}
+                    items={[...this.state.groups, ...this.state.parentGroups]}
                     selectedItems={this.getSelectizeItems(
                       this.state.group.parent_groups,
-                      this.state.groups,
+                      [...this.state.groups, ...this.state.parentGroups],
                     )}
                     textInputProps={{
                       placeholder: i18n.t('groupDetailScreen.searchGroups'),
@@ -3323,7 +3566,20 @@ class GroupDetailScreen extends React.Component {
                       <Chip
                         key={id}
                         iconStyle={iconStyle}
-                        onClose={onClose}
+                        onClose={(props) => {
+                          let foundParentGroupIndex = this.state.parentGroups.findIndex(
+                            (parentGroup) => parentGroup.value === id
+                          );
+                          if (foundParentGroupIndex > -1) {
+                            // Remove parent group from list
+                            const parentGroups = [...this.state.parentGroups];
+                            parentGroups.splice(foundParentGroupIndex, 1);
+                            this.setState({
+                              parentGroups: [...parentGroups],
+                            });
+                          }
+                          onClose(props);
+                        }}
                         text={item.name}
                         style={style}
                       />
@@ -3358,10 +3614,10 @@ class GroupDetailScreen extends React.Component {
                       peerGroupsSelectizeRef = selectize;
                     }}
                     itemId="value"
-                    items={this.state.groups}
+                    items={[...this.state.groups, this.state.peerGroups]}
                     selectedItems={this.getSelectizeItems(
                       this.state.group.peer_groups,
-                      this.state.groups,
+                      [...this.state.groups, this.state.peerGroups],
                     )}
                     textInputProps={{
                       placeholder: i18n.t('groupDetailScreen.searchPeerGroups'),
@@ -3404,7 +3660,20 @@ class GroupDetailScreen extends React.Component {
                       <Chip
                         key={id}
                         iconStyle={iconStyle}
-                        onClose={onClose}
+                        onClose={(props) => {
+                          let foundPeerGroupIndex = this.state.peerGroups.findIndex(
+                            (peerGroup) => peerGroup.value === id
+                          );
+                          if (foundPeerGroupIndex > -1) {
+                            // Remove peer group from list
+                            const peerGroups = [...this.state.peerGroups];
+                            peerGroups.splice(foundPeerGroupIndex, 1);
+                            this.setState({
+                              peerGroups: [...peerGroups],
+                            });
+                          }
+                          onClose(props);
+                        }}
                         text={item.name}
                         style={style}
                       />
@@ -3439,10 +3708,10 @@ class GroupDetailScreen extends React.Component {
                       childGroupsSelectizeRef = selectize;
                     }}
                     itemId="value"
-                    items={this.state.groups}
+                    items={[...this.state.groups, ...this.state.childGroups]}
                     selectedItems={this.getSelectizeItems(
                       this.state.group.child_groups,
-                      this.state.groups,
+                      [...this.state.groups, ...this.state.childGroups],
                     )}
                     textInputProps={{
                       placeholder: i18n.t('groupDetailScreen.searchChildGroups'),
@@ -3485,7 +3754,20 @@ class GroupDetailScreen extends React.Component {
                       <Chip
                         key={id}
                         iconStyle={iconStyle}
-                        onClose={onClose}
+                        onClose={(props) => {
+                          let foundChildGroupIndex = this.state.childGroups.findIndex(
+                            (childGroup) => childGroup.value === id
+                          );
+                          if (foundChildGroupIndex > -1) {
+                            // Remove child group from list
+                            const childGroups = [...this.state.childGroups];
+                            childGroups.splice(foundChildGroupIndex, 1);
+                            this.setState({
+                              childGroups: [...childGroups],
+                            });
+                          }
+                          onClose(props);
+                        }}
                         text={item.name}
                         style={style}
                       />
diff --git a/store/reducers/contacts.reducer.js b/store/reducers/contacts.reducer.js
index bfffe1f0..7868f2e4 100644
--- a/store/reducers/contacts.reducer.js
+++ b/store/reducers/contacts.reducer.js
@@ -92,7 +92,10 @@ export default function contactsReducer(state = initialState, action) {
                     mappedContact[key] = value.timestamp;
                   } else if (key === 'assigned_to') {
                     // assigned-to property
-                    mappedContact[key] = value['assigned-to'];
+                    mappedContact[key] = {
+                      key: parseInt(value['assigned-to'].replace('user-', '')),
+                      label: value['display']
+                    };
                   }
                   return;
                 }
@@ -228,7 +231,10 @@ export default function contactsReducer(state = initialState, action) {
                   mappedContact[key] = value.timestamp;
                 } else if (key === 'assigned_to') {
                   // assigned-to property
-                  mappedContact[key] = value['assigned-to'];
+                  mappedContact[key] = {
+                    key: parseInt(value['assigned-to'].replace('user-', '')),
+                    label: value['display']
+                  };
                 }
                 return;
               }
@@ -499,7 +505,10 @@ export default function contactsReducer(state = initialState, action) {
                   mappedContact[key] = value.timestamp;
                 } else if (key === 'assigned_to') {
                   // assigned-to property
-                  mappedContact[key] = value['assigned-to'];
+                  mappedContact[key] = {
+                    key: parseInt(value['assigned-to'].replace('user-', '')),
+                    label: value['display']
+                  };
                 }
                 return;
               }
diff --git a/store/reducers/groups.reducer.js b/store/reducers/groups.reducer.js
index e5910f11..f5cbe43d 100644
--- a/store/reducers/groups.reducer.js
+++ b/store/reducers/groups.reducer.js
@@ -112,7 +112,7 @@ export default function groupsReducer(state = initialState, action) {
                   return;
                 }
                 case '[object Number]': {
-                  if(key === 'ID') {
+                  if (key === 'ID') {
                     mappedGroup[key] = value.toString();
                   } else {
                     mappedGroup[key] = value;
@@ -142,7 +142,10 @@ export default function groupsReducer(state = initialState, action) {
                     mappedGroup[key] = value.timestamp;
                   } else if (key === 'assigned_to') {
                     // assigned-to property
-                    mappedGroup[key] = value['assigned-to'];
+                    mappedGroup[key] = {
+                      key: parseInt(value['assigned-to'].replace('user-', '')),
+                      label: value['display']
+                    };
                   }
                   return;
                 }
@@ -158,17 +161,15 @@ export default function groupsReducer(state = initialState, action) {
                             name: entities.decode(valueTwo.post_title)
                           };
                           // groups
-                          if (
-                            Object.prototype.hasOwnProperty.call(
-                              valueTwo,
-                              'baptized_member_count',
-                            ) &&
-                            Object.prototype.hasOwnProperty.call(valueTwo, 'member_count')
-                          ) {
+                          if (Object.prototype.hasOwnProperty.call(valueTwo, 'baptized_member_count')) {
                             object = {
                               ...object,
-                              post_title: valueTwo.post_title,
                               baptized_member_count: valueTwo.baptized_member_count,
+                            };
+                          }
+                          if(Object.prototype.hasOwnProperty.call(valueTwo, 'member_count')) {
+                            object = {
+                              ...object,
                               member_count: valueTwo.member_count,
                             };
                           }
@@ -272,7 +273,7 @@ export default function groupsReducer(state = initialState, action) {
                 return;
               }
               case '[object Number]': {
-                if(key === 'ID') {
+                if (key === 'ID') {
                   mappedGroup[key] = value.toString();
                 } else {
                   mappedGroup[key] = value;
@@ -302,7 +303,10 @@ export default function groupsReducer(state = initialState, action) {
                   mappedGroup[key] = value.timestamp;
                 } else if (key === 'assigned_to') {
                   // assigned-to property
-                  mappedGroup[key] = value['assigned-to'];
+                  mappedGroup[key] = {
+                    key: parseInt(value['assigned-to'].replace('user-', '')),
+                    label: value['display']
+                  };
                 }
                 return;
               }
@@ -318,14 +322,15 @@ export default function groupsReducer(state = initialState, action) {
                           name: entities.decode(valueTwo.post_title)
                         };
                         // groups
-                        if (
-                          Object.prototype.hasOwnProperty.call(valueTwo, 'baptized_member_count') &&
-                          Object.prototype.hasOwnProperty.call(valueTwo, 'member_count')
-                        ) {
+                        if (Object.prototype.hasOwnProperty.call(valueTwo, 'baptized_member_count')) {
                           object = {
                             ...object,
-                            post_title: valueTwo.post_title,
                             baptized_member_count: valueTwo.baptized_member_count,
+                          };
+                        }
+                        if(Object.prototype.hasOwnProperty.call(valueTwo, 'member_count')) {
+                          object = {
+                            ...object,
                             member_count: valueTwo.member_count,
                           };
                         }
@@ -576,7 +581,7 @@ export default function groupsReducer(state = initialState, action) {
                 return;
               }
               case '[object Number]': {
-                if(key === 'ID') {
+                if (key === 'ID') {
                   mappedGroup[key] = value.toString();
                 } else {
                   mappedGroup[key] = value;
@@ -606,7 +611,10 @@ export default function groupsReducer(state = initialState, action) {
                   mappedGroup[key] = value.timestamp;
                 } else if (key === 'assigned_to') {
                   // assigned-to property
-                  mappedGroup[key] = value['assigned-to'];
+                  mappedGroup[key] = {
+                    key: parseInt(value['assigned-to'].replace('user-', '')),
+                    label: value['display']
+                  };
                 }
                 return;
               }
@@ -622,14 +630,15 @@ export default function groupsReducer(state = initialState, action) {
                           name: entities.decode(valueTwo.post_title)
                         };
                         // groups
-                        if (
-                          Object.prototype.hasOwnProperty.call(valueTwo, 'baptized_member_count') &&
-                          Object.prototype.hasOwnProperty.call(valueTwo, 'member_count')
-                        ) {
+                        if (Object.prototype.hasOwnProperty.call(valueTwo, 'baptized_member_count')) {
                           object = {
                             ...object,
-                            post_title: valueTwo.post_title,
                             baptized_member_count: valueTwo.baptized_member_count,
+                          };
+                        }
+                        if(Object.prototype.hasOwnProperty.call(valueTwo, 'member_count')) {
+                          object = {
+                            ...object,
                             member_count: valueTwo.member_count,
                           };
                         }
diff --git a/store/sagas/contacts.sagas.js b/store/sagas/contacts.sagas.js
index bd825d5a..12523205 100644
--- a/store/sagas/contacts.sagas.js
+++ b/store/sagas/contacts.sagas.js
@@ -1,4 +1,5 @@
 import { put, take, takeEvery, takeLatest, all, select } from 'redux-saga/effects';
+import ExpoFileSystemStorage from 'redux-persist-expo-filesystem';
 
 import * as actions from '../actions/contacts.actions';
 
@@ -123,6 +124,23 @@ export function* save({ domain, token, contactData }) {
           ID: contactId,
         };
       }
+      if (jsonData.assigned_to) {
+        let assignedToId = parseInt(jsonData.assigned_to.replace('user-', ''));
+        let usersList = yield ExpoFileSystemStorage.getItem('usersList');
+        usersList = JSON.parse(usersList).map((user) => ({
+          key: user.ID,
+          label: user.name,
+        }));
+
+        jsonData = {
+          ...jsonData,
+          assigned_to: {
+            key: assignedToId,
+            label: usersList.find((user) => user.key === assignedToId).label
+          }
+        };
+
+      }
       yield put({
         type: actions.CONTACTS_SAVE_SUCCESS,
         contact: jsonData,
diff --git a/store/sagas/groups.sagas.js b/store/sagas/groups.sagas.js
index 1e624e4d..2d79028d 100644
--- a/store/sagas/groups.sagas.js
+++ b/store/sagas/groups.sagas.js
@@ -1,4 +1,5 @@
 import { put, take, all, takeLatest, takeEvery, select } from 'redux-saga/effects';
+import ExpoFileSystemStorage from 'redux-persist-expo-filesystem';
 
 import * as actions from '../actions/groups.actions';
 
@@ -109,6 +110,23 @@ export function* saveGroup({ domain, token, groupData }) {
           ID: groupId,
         };
       }
+      if (jsonData.assigned_to) {
+        let assignedToId = parseInt(jsonData.assigned_to.replace('user-', ''));
+        let usersList = yield ExpoFileSystemStorage.getItem('usersList');
+        usersList = JSON.parse(usersList).map((user) => ({
+          key: user.ID,
+          label: user.name,
+        }));
+
+        jsonData = {
+          ...jsonData,
+          assigned_to: {
+            key: assignedToId,
+            label: usersList.find((user) => user.key === assignedToId).label
+          }
+        };
+
+      }
       yield put({
         type: actions.GROUPS_SAVE_SUCCESS,
         group: jsonData,