diff --git a/ubisync-lib/src/messages/mod.rs b/ubisync-lib/src/messages/mod.rs
index 257368f..587964d 100644
--- a/ubisync-lib/src/messages/mod.rs
+++ b/ubisync-lib/src/messages/mod.rs
@@ -18,6 +18,7 @@ pub struct MessageRelations {
 pub enum MessageContent {
     Hello {
         peer_name: String,
+        family: Option<Family>,
     },
     JoinFamily,
     AddedToFamily {
diff --git a/ubisync/src/comm/message_processor.rs b/ubisync/src/comm/message_processor.rs
index 4e2dd5f..a10bf6b 100644
--- a/ubisync/src/comm/message_processor.rs
+++ b/ubisync/src/comm/message_processor.rs
@@ -17,9 +17,9 @@ pub fn handle(state: &CommState, peer: &PeerId, message: Message) {
         state.own_peer_id().unwrap()
     );
     match message.content() {
-        MessageContent::Hello { peer_name } => {
+        MessageContent::Hello { peer_name, family } => {
             state
-                .set_peer(Peer::new(peer.to_owned(), Some(peer_name.to_string()), None)) //TODO: Allow sending Family in Hello message
+                .set_peer(Peer::new(peer.to_owned(), Some(peer_name.to_string()), family.to_owned()))
                 .expect("State failed");
         }
         MessageContent::JoinFamily => state.request_family_join(peer.to_owned()),