diff --git a/lsp/mist.js b/lsp/mist.js
index 8be7a5d4..0b3b3652 100644
--- a/lsp/mist.js
+++ b/lsp/mist.js
@@ -2824,7 +2824,7 @@ var UI = {
         var embedoptions = {autoplay: true};
         function embedhtml(opts) {
           var open = ['div'];
-          var inner = "\n"+'   <script src="'+embedbase+'embed_'+other+'.js"><'+'/script>'+"\n"; //don't leave the closing script tag complete
+          var inner = "\n"+'   <script src="'+embedbase+'embed_'+encodeURIComponent(other)+'.js"><'+'/script>'+"\n"; //don't leave the closing script tag complete
           if (!opts.autoplay) {
             open.push('data-noautoplay');
           }
@@ -2844,17 +2844,17 @@ var UI = {
           {
             label: 'Embedable script',
             type: 'str',
-            value: embedbase+'embed_'+other+'.js',
+            value: embedbase+'embed_'+encodeURIComponent(other)+'.js',
             readonly: true
           },{
             label: 'Stream info script',
             type: 'str',
-            value: embedbase+'info_'+other+'.js',
+            value: embedbase+'info_'+encodeURIComponent(other)+'.js',
             readonly: true
           },{
             label: 'Autodetect player',
             type: 'str',
-            value: embedbase+other+'.html',
+            value: embedbase+encodeURIComponent(other)+'.html',
             readonly: true,
             qrcode: true
           },$('<h3>').text('Embed code'),{
@@ -3027,7 +3027,7 @@ var UI = {
           
           // jQuery doesn't work -> use DOM magic
           var script = document.createElement('script');
-          script.src = embedbase+'embed_'+other+'.js';
+          script.src = embedbase+'embed_'+encodeURIComponent(other)+'.js';
           script.onerror = function(){
             $c.html('Error loading "'+script.src+'".<br>').append(
               $('<button>').text('Try again').click(function(){
diff --git a/lsp/test_streamembed.html b/lsp/test_streamembed.html
index d2b1839e..79755642 100644
--- a/lsp/test_streamembed.html
+++ b/lsp/test_streamembed.html
@@ -14,7 +14,7 @@
           var embedtype = $('input[name=force]').val();
           
           var info = document.createElement('script');
-          info.src = 'http://'+(window.location.hostname == '' ? 'localhost' : window.location.hostname)+':8080/info_'+streamName+'.js?video=0';
+          info.src = 'http://'+(window.location.hostname == '' ? 'localhost' : window.location.hostname)+':8080/info_'+encodeURIComponent(streamName)+'.js';
           document.getElementById('embedcontainer').appendChild(info);
           info.onload = function(){
             if (embedtype == '') {
@@ -45,4 +45,4 @@
     <div id=embedcontainer style="width: 100%; height: 35em;" data-forcesupportcheck data-autoplay>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/embed.js b/src/embed.js
index 6966fe46..264c3e38 100644
--- a/src/embed.js
+++ b/src/embed.js
@@ -189,7 +189,7 @@ function mistembed(streamname) {
       break;
 
       case 'html5':
-        container.innerHTML += '<video width="' + videowidth + '" height="' + videoheight + '" src="' + encodeURI(src.url) + '" controls="controls" '+(autoplay ? 'autoplay="autoplay"' : '')+'><strong>No HTML5 video support</strong></video>';
+        container.innerHTML += '<video width="' + videowidth + '" height="' + videoheight + '" src="' + src.url + '" controls="controls" '+(autoplay ? 'autoplay="autoplay"' : '')+'><strong>No HTML5 video support</strong></video>';
         break;
         
       case 'rtsp':
diff --git a/src/output/output.cpp b/src/output/output.cpp
index 6d8a734c..b5686932 100644
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@@ -1034,6 +1034,7 @@ namespace Mist {
       }
       stats();
     }
+    onFinish();
     MEDIUM_MSG("MistOut client handler shutting down: %s, %s, %s", myConn.connected() ? "conn_active" : "conn_closed", wantRequest ? "want_request" : "no_want_request", parseData ? "parsing_data" : "not_parsing_data");
     
     /*LTS-START*/
@@ -1332,11 +1333,13 @@ namespace Mist {
       nProxy.userClient = IPC::sharedClient(userPageName, PLAY_EX_SIZE, true);
       if (!nProxy.userClient.getData()){
         WARN_MSG("Player connection failure - aborting output");
+        onFinish();
         myConn.close();
         return;
       }
     }
     if (!nProxy.userClient.isAlive()){
+      onFinish();
       myConn.close();
       return;
     }
diff --git a/src/output/output_rtmp.cpp b/src/output/output_rtmp.cpp
index 8a25e443..9ad7ee4a 100644
--- a/src/output/output_rtmp.cpp
+++ b/src/output/output_rtmp.cpp
@@ -169,6 +169,38 @@ namespace Mist {
     }
   }
 
+  bool OutRTMP::onFinish(){
+    MEDIUM_MSG("Finishing stream %s, %s", streamName.c_str(), myConn?"while connected":"already disconnected");
+    if (myConn){
+      myConn.SendNow(RTMPStream::SendUSR(1, 1)); //send UCM StreamEOF (1), stream 1
+      AMF::Object amfreply("container", AMF::AMF0_DDV_CONTAINER);
+      amfreply.addContent(AMF::Object("", "onStatus")); //status reply
+      amfreply.addContent(AMF::Object("", (double)0)); //transaction ID
+      amfreply.addContent(AMF::Object("", (double)0, AMF::AMF0_NULL)); //null - command info
+      amfreply.addContent(AMF::Object("")); //info
+      amfreply.getContentP(3)->addContent(AMF::Object("level", "status"));
+      amfreply.getContentP(3)->addContent(AMF::Object("code", "NetStream.Play.Stop"));
+      amfreply.getContentP(3)->addContent(AMF::Object("description", "Stream stopped"));
+      amfreply.getContentP(3)->addContent(AMF::Object("details", "DDV"));
+      amfreply.getContentP(3)->addContent(AMF::Object("clientid", (double)1337));
+      sendCommand(amfreply, 20, 1);
+
+      amfreply = AMF::Object ("container", AMF::AMF0_DDV_CONTAINER);
+      amfreply.addContent(AMF::Object("", "onStatus")); //status reply
+      amfreply.addContent(AMF::Object("", (double)0)); //transaction ID
+      amfreply.addContent(AMF::Object("", (double)0, AMF::AMF0_NULL)); //null - command info
+      amfreply.addContent(AMF::Object("")); //info
+      amfreply.getContentP(3)->addContent(AMF::Object("level", "status"));
+      amfreply.getContentP(3)->addContent(AMF::Object("code", "NetStream.Play.UnpublishNotify"));
+      amfreply.getContentP(3)->addContent(AMF::Object("description", "Stream stopped"));
+      amfreply.getContentP(3)->addContent(AMF::Object("clientid", (double)1337));
+      sendCommand(amfreply, 20, 1);
+
+      myConn.close();
+    }
+    return false;
+  }
+
   void OutRTMP::parseVars(std::string data){
     std::string varname;
     std::string varval;
@@ -614,6 +646,7 @@ namespace Mist {
     } //createStream
     if ((amfData.getContentP(0)->StrValue() == "closeStream") || (amfData.getContentP(0)->StrValue() == "deleteStream")) {
       stop();
+      onFinish();
       return;
     }
     if ((amfData.getContentP(0)->StrValue() == "FCUnpublish") || (amfData.getContentP(0)->StrValue() == "releaseStream")) {
@@ -713,7 +746,7 @@ namespace Mist {
         if (streamCfg){
           if (streamCfg.getMember("source").asString().substr(0, 7) != "push://"){
             FAIL_MSG("Push rejected - stream %s not a push-able stream. (%s != push://*)", streamName.c_str(), streamCfg.getMember("source").asString().c_str());
-            myConn.close();
+            onFinish();
           }else{
             std::string source = streamCfg.getMember("source").asString().substr(7);
             std::string IP = source.substr(0, source.find('@'));
@@ -747,13 +780,13 @@ namespace Mist {
             if (IP != ""){
               if (!myConn.isAddress(IP)){
                 FAIL_MSG("Push from %s to %s rejected - source host not whitelisted", getConnectedHost().c_str(), streamName.c_str());
-                myConn.close();
+                onFinish();
               }
             }
           }
         }else{
           FAIL_MSG("Push from %s rejected - stream '%s' not configured.", getConnectedHost().c_str(), streamName.c_str());
-          myConn.close();
+          onFinish();
         }
         configLock.post();
         configLock.close();
@@ -994,7 +1027,7 @@ namespace Mist {
             inputBuffer.get().clear();
           }
           stop();
-          myConn.close();
+          onFinish();
           break; //happens when connection breaks unexpectedly
         case 1: //set chunk size
           RTMPStream::chunk_rec_max = ntohl(*(int *)next.data.c_str());
@@ -1067,7 +1100,7 @@ namespace Mist {
           static std::map<unsigned int, AMF::Object> pushMeta;
           if (!isInitialized) {
             MEDIUM_MSG("Received useless media data");
-            myConn.close();
+            onFinish();
             break;
           }
           F.ChunkLoader(next);
diff --git a/src/output/output_rtmp.h b/src/output/output_rtmp.h
index 700624e8..d0d160db 100644
--- a/src/output/output_rtmp.h
+++ b/src/output/output_rtmp.h
@@ -16,6 +16,7 @@ namespace Mist {
       bool isReadyForPlay();
       static bool listenMode();
       void requestHandler();
+      bool onFinish();
     protected:
       bool isPushing;
       unsigned int maxbps;