diff --git a/includes/themes/media_youtube.theme.inc b/includes/themes/media_youtube.theme.inc
index 09fbe6f..eb686cf 100644
--- a/includes/themes/media_youtube.theme.inc
+++ b/includes/themes/media_youtube.theme.inc
@@ -20,7 +20,7 @@ function media_youtube_preprocess_media_youtube_video(&$variables) {
   $variables['height'] = isset($variables['height']) ? $variables['height'] : media_youtube_variable_get('height');
   $variables['autoplay'] = isset($variables['autoplay']) ? $variables['autoplay'] : media_youtube_variable_get('autoplay');
   $variables['fullscreen'] = isset($variables['fullscreen']) ? $variables['fullscreen'] : media_youtube_variable_get('fullscreen');
-  $variables['autoplay'] = $variables['autoplay'] ? 1 : 1;
+  $variables['autoplay'] = $variables['autoplay'] ? 1 : 0;
   $variables['fullscreen'] = $variables['fullscreen'] ? 'true' : 'false';
 
   $variables['wrapper_id'] = 'media_youtube_' . $variables['video_id'] . '_' . $variables['id'];
@@ -60,6 +60,7 @@ OUTPUT;
         $JSObject.video_id = "{$variables['video_id']}";
         $JSObject.fullscreen = {$variables['fullscreen']};
         $JSObject.id = $iframe_id;
+        $JSObject.options = { autoplay: {$variables['autoplay']} };
         Drupal.media_youtube.insertEmbed($wrapper_id);
       }
     </script>
diff --git a/js/media_youtube.js b/js/media_youtube.js
index e2f3e1c..7a744fd 100644
--- a/js/media_youtube.js
+++ b/js/media_youtube.js
@@ -48,7 +48,7 @@ Drupal.media_youtube.insertEmbed = function (embed_id) {
   var src = 'http://www.youtube.com/embed/' + settings.video_id;
 
   // Allow other modules to modify the video settings.
-  settings.options = {wmode : 'opaque'};
+  settings.options.wmode = 'opaque';
   $(window).trigger('media_youtube_load', settings);
 
   // Merge YouTube options (such as autoplay) into the source URL.