diff --git a/web/includes/functions.php b/web/includes/functions.php
index 35d9ace76..3552846b0 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -875,7 +875,7 @@ function canStreamIframe()
 
 function canStreamNative()
 {
-   return( ZM_CAN_STREAM == "yes" || ( ZM_CAN_STREAM == "auto" && (isNetscape() || isKonqueror()) ) );
+   return( ZM_WEB_CAN_STREAM == "yes" || ( ZM_WEB_CAN_STREAM == "auto" && (isNetscape() || isKonqueror()) ) );
 }
 
 function canStreamApplet()
@@ -2205,7 +2205,7 @@ function jsonEncode( &$value )
                 {
                     if ( $result != '{' )
                         $result .= ',';
-                    $result .= jsonEncode( $subkey ).':'.jsonEncode( $subvalue );
+                    $result .= '"'.jsonEncode( $subkey ).'":'.jsonEncode( $subvalue );
                 }
                 return( $result.'}' );
             }