fix: Update group name on self-additions and missing messages (#6412)

fix: Update group name on self-additions and missing messages (#6412) #9308