diff --git a/nirvana-ios/Repositories/FirestoreService.swift b/nirvana-ios/Repositories/FirestoreService.swift
index 2329e6f..3bfcad1 100644
--- a/nirvana-ios/Repositories/FirestoreService.swift
+++ b/nirvana-ios/Repositories/FirestoreService.swift
@@ -133,7 +133,7 @@ class FirestoreService {
                     else { // there seems to be something existing
                         for document in querySnapshot!.documents {
                             // update this userFriend that is existing
-                            let _ = try? userFriendCollection.document(document.documentID).setData(from: userFriend)
+                            let _ = try? userFriendCollection.document(document.documentID).setData(["isActive": true, "lastUpdatedTimestamp": self.getFirestoreServerTimestamp()], merge:true)
                             print("already existing, just updated")
                             completion(ServiceState.success("updated userfriend in firestore service"))
                         }
diff --git a/nirvana-ios/Views/Contacts/ContactsViewModel.swift b/nirvana-ios/Views/Contacts/ContactsViewModel.swift
index 8e9c404..2977cff 100644
--- a/nirvana-ios/Views/Contacts/ContactsViewModel.swift
+++ b/nirvana-ios/Views/Contacts/ContactsViewModel.swift
@@ -101,7 +101,7 @@ class ContactsViewModel : ObservableObject {
         }
         
         // setting timestamps to nil to make sure that new server timestamp is set
-        var userFriend = UserFriends(userId: userId, friendId: friendId, isActive: true, lastUpdatedTimestamp: nil, createdTimestamp: nil)
+        var userFriend = UserFriends(userId: userId, friendId: friendId, isActive: true, lastUpdatedTimestamp: nil)
         
         self.firestoreService.createOrUpdateUserFriends(userFriend: userFriend) {[weak self] res in
             completion(res)