diff --git a/xmpp/handlers.go b/xmpp/handlers.go
index fde7382..0de33b8 100644
--- a/xmpp/handlers.go
+++ b/xmpp/handlers.go
@@ -340,6 +340,10 @@ func handleGetDisco(dt discoType, s xmpp.Sender, iq *stanza.IQ) {
 	if dt == discoTypeInfo {
 		disco := answer.DiscoInfo()
 		toID, toOk := toToID(iq.To)
+		if !toOk {
+			disco.AddIdentity("Telegram Gateway", "gateway", "telegram")
+		}
+
 		var isMuc bool
 		bare, _, fromOk := splitFrom(iq.From)
 		if fromOk {
@@ -386,12 +390,8 @@ func handleGetDisco(dt discoType, s xmpp.Sender, iq *stanza.IQ) {
 				}
 			}
 		}
-		if toOk {
-			if !isMuc {
-				disco.AddIdentity("", "account", "registered")
-			}
-		} else {
-			disco.AddIdentity("Telegram Gateway", "gateway", "telegram")
+		if toOk && !isMuc {
+			disco.AddIdentity("", "account", "registered")
 		}
 		answer.Payload = disco
 	} else if dt == discoTypeItems {