diff --git a/stream/telnet/telnet.go b/stream/telnet/telnet.go
index b8ef35f..e5c5e23 100644
--- a/stream/telnet/telnet.go
+++ b/stream/telnet/telnet.go
@@ -56,7 +56,7 @@ func handleViewer(s net.Conn, streams *messaging.Streams, cfg *Options) {
 		s.Close()
 		return
 	}
-	name := strings.TrimSpace(string(buff[:n])) + "@text"
+	name := strings.TrimSpace(string(buff[:n]))
 	if len(name) < 1 {
 		// Too short, exit
 		s.Close()
@@ -69,7 +69,7 @@ func handleViewer(s net.Conn, streams *messaging.Streams, cfg *Options) {
 	// Get requested stream
 	stream, err := streams.Get(name)
 	if err != nil {
-		log.Printf("Stream does not exist, kicking new Telnet viewer: %s", err)
+		log.Printf("Kicking new Telnet viewer: %s", err)
 		if _, err := s.Write([]byte("This stream is inactive.\n")); err != nil {
 			log.Printf("Error while writing to TCP socket: %s", err)
 		}
@@ -78,11 +78,13 @@ func handleViewer(s net.Conn, streams *messaging.Streams, cfg *Options) {
 	}
 
 	// Get requested quality
-	// FIXME: make qualities available
-	qualityName := "source"
+	qualityName := "text"
 	q, err := stream.GetQuality(qualityName)
 	if err != nil {
-		log.Printf("Failed to get quality: %s", err)
+		log.Printf("Kicking new Telnet viewer: %s", err)
+		if _, err := s.Write([]byte("This stream is not converted to text.\n")); err != nil {
+			log.Printf("Error while writing to TCP socket: %s", err)
+		}
 		s.Close()
 		return
 	}
diff --git a/web/handler.go b/web/handler.go
index ec903b2..3b6cc38 100644
--- a/web/handler.go
+++ b/web/handler.go
@@ -157,6 +157,7 @@ func statisticsHandler(w http.ResponseWriter, r *http.Request) {
 	stream, err := streams.Get(name)
 	if err == nil {
 		userCount = stream.ClientCount()
+		userCount += webrtc.GetNumberConnectedSessions(name)
 	}
 
 	// Display connected users statistics