diff --git a/go/characters/incominglistener.go b/go/characters/incominglistener.go
index f0c47ea..4ca7371 100644
--- a/go/characters/incominglistener.go
+++ b/go/characters/incominglistener.go
@@ -5,7 +5,9 @@ import (
 	"cwtch.im/ui/go/cwutil"
 	"cwtch.im/ui/go/gobjects"
 	"cwtch.im/ui/go/the"
+	"encoding/base32"
 	"git.openprivacy.ca/openprivacy/libricochet-go/log"
+	"strings"
 	"time"
 )
 
@@ -28,6 +30,10 @@ func IncomingListener(callback func(*gobjects.Message)) {
 				Image:     cwutil.RandomProfileImage(e.Data[event.RemotePeer]),
 				Timestamp: ts,
 			})
+			if the.Peer.GetContact(e.Data[event.RemotePeer]) == nil {
+				decodedPub, _ := base32.StdEncoding.DecodeString(strings.ToUpper(e.Data[event.RemotePeer]))
+				the.Peer.AddContact(e.Data[event.RemotePeer], e.Data[event.RemotePeer], decodedPub, false)
+			}
 			the.Peer.PeerWithOnion(e.Data[event.RemotePeer])
 			if e.Data[event.Data] != "ack" {
 				the.Peer.SendMessageToPeer(e.Data[event.RemotePeer], "ack")
diff --git a/qml/panes/OverlayPane.qml b/qml/panes/OverlayPane.qml
index f3703be..afe5c46 100644
--- a/qml/panes/OverlayPane.qml
+++ b/qml/panes/OverlayPane.qml
@@ -31,7 +31,7 @@ ColumnLayout {
 	}
 
 	RowLayout {
-		visible:!overlay.accepted
+		visible:!overlay.accepted && (gcd.currentOpenConversation.length == 32)
 		Text {
 			text: "Do you want to accept the invitation to " + overlay.name + "?"
 		}