diff --git a/filter/mediaplugin/mediaplugin.php b/filter/mediaplugin/mediaplugin.php
index 3f0e858f689..c5e8c6edd24 100644
--- a/filter/mediaplugin/mediaplugin.php
+++ b/filter/mediaplugin/mediaplugin.php
@@ -28,20 +28,20 @@
 function mediaplugin_filter($courseid, $text) {
     global $CFG;
 
-    $search = '/<a(.*)href=\"(.*)\.mp3\"(.*)>(.*)<\/a>/i';
+    $search = '/<a(.*)href=\"(.*)\.mp3\"([^>]*)>([^>]*)<\/a>/i';
 
     $replace = '\\0 <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"';
     $replace .= 'codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0" ';
     $replace .= 'width="200" height="70" id="mp3player" align="">';
-    $replace .= "<param name=movie value=\"$CFG->wwwroot/lib/mp3player/mp3player.swf?src=\\2.mp3&autostart=no\">";
+    $replace .= "<param name=movie value=\"$CFG->wwwroot/lib/mp3player/mp3player.swf?src=\\2.mp3\">";
     $replace .= '<param name=quality value=high>';
     $replace .= '<param name=bgcolor value="#333333">';
-    $replace .= "<embed src=\"$CFG->wwwroot/lib/mp3player/mp3player.swf?src=\\2.mp3&autostart=no\" ";
+    $replace .= "<embed src=\"$CFG->wwwroot/lib/mp3player/mp3player.swf?src=\\2.mp3\" ";
     $replace .= " quality=high bgcolor=\"#333333\" width=\"400\" height=\"50\" name=\"mp3player\" ";
     $replace .= ' type="application/x-shockwave-flash" ';
     $replace .= ' pluginspage="http://www.macromedia.com/go/getflashplayer">';
     $replace .= '</embed>';
-    $replace .= '</object>';
+    $replace .= '</object> ';
 
     return preg_replace($search, $replace, $text);
 }