diff --git a/lib/class/stream_playlist.class.php b/lib/class/stream_playlist.class.php
index 67fa86cd..b8d12154 100644
--- a/lib/class/stream_playlist.class.php
+++ b/lib/class/stream_playlist.class.php
@@ -160,7 +160,6 @@ class Stream_Playlist {
             case 'democratic':
             case 'localplay':
             case 'html5_player':
-			case 'html5_player_embedded':
                 // These are valid, but witchy
                 $redirect = false;
                 unset($ext);
@@ -358,17 +357,14 @@ class Stream_Playlist {
      * Creates an html5 player.
      */
     public function create_html5_player() {
-        require Config::get('prefix') . '/templates/create_html5_player.inc.php';       
-    }
-	
-	/**
-     * create_html5_player_embedded
-     *
-     * Creates an html5 player embedded.
-     */
-    public function create_html5_player_embedded() {
-        require Config::get('prefix') . '/templates/create_html5_player_embedded.inc.php';       
-    }
+    
+        if (Config::get("iframes")) {
+            require Config::get('prefix') . '/templates/create_html5_player_embedded.inc.php';  
+        } else {
+            require Config::get('prefix') . '/templates/create_html5_player.inc.php';
+        }
+        
+    }  // create_html5_player
 
     /**
      * create_localplay
diff --git a/lib/preferences.php b/lib/preferences.php
index 1d5599ae..a40af5e0 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -178,7 +178,6 @@ function create_preference_input($name,$value) {
             if ($value == 'localplay') { $is_local = 'selected="selected"'; }
             elseif ($value == 'democratic') { $is_vote = 'selected="selected"'; }
             elseif ($value == 'html5_player') { $is_html5_player = 'selected="selected"'; }
-            elseif ($value == 'html5_player_embedded') { $is_html5_player_embedded = 'selected="selected"'; }
             else { $is_stream = "selected=\"selected\""; }
             echo "<select name=\"$name\">\n";
             echo "\t<option value=\"\">" . T_('None') . "</option>\n";
@@ -192,7 +191,6 @@ function create_preference_input($name,$value) {
                 echo "\t<option value=\"localplay\" $is_local>" . T_('Localplay') . "</option>\n";
             }
             echo "\t<option value=\"html5_player\" $is_html5_player>" . _('HTML5 Player') . "</option>\n";
-            echo "\t<option value=\"html5_player_embedded\" $is_html5_player_embedded>" . _('Framed Player') . "</option>\n";
             echo "</select>\n";
         break;
         case 'playlist_type':
diff --git a/server/stream.ajax.php b/server/stream.ajax.php
index a53328bc..a573a448 100644
--- a/server/stream.ajax.php
+++ b/server/stream.ajax.php
@@ -45,7 +45,6 @@ switch ($_REQUEST['action']) {
                 $new = $_POST['type'];
             break;
             case 'html5_player':
-            case 'html5_player_embedded':
                 $new = $_POST['type'];
                 // Rien a faire
             break;
diff --git a/templates/show_playtype_switch.inc.php b/templates/show_playtype_switch.inc.php
index 83caf716..6ff4c9d3 100644
--- a/templates/show_playtype_switch.inc.php
+++ b/templates/show_playtype_switch.inc.php
@@ -37,13 +37,6 @@ if (Preference::has_access('play_type')) {
         <option value="democratic" <?php echo $is_democratic; ?>><?php echo T_('Democratic'); ?></option>
     <?php } ?>
     <option value="html5_player" <?php echo $is_html5_player; ?>><?php echo T_('HTML5 Player'); ?></option>
-<?php
-if (Config::get("iframes")) {
-?>
-    <option value="html5_player_embedded" <?php echo $is_html5_player_embedded; ?>><?php echo T_('Framed Player'); ?></option>
-<?php
-}
-?>
 </select>
 <?php echo Ajax::observe('play_type_select','change',Ajax::action('?page=stream&action=set_play_type','play_type_select','play_type_form'),'1'); ?>
 </form>