diff --git a/amd/src/form.js b/amd/src/form.js
index 2baaa55694b9effa4369daefaf3c7885da6a0007..36626a681894bbbc85ef01d93d22ae348394320a 100644
--- a/amd/src/form.js
+++ b/amd/src/form.js
@@ -39,7 +39,7 @@ define(['jquery'], function($) {
                     xhrFields: {withCredentials: true},
                     data: $('#ltiLaunchForm').serialize(),
                     complete: function () {
-                        $("iframe").each(function () {
+                        $(".ocplayer").each(function () {
                             $(this).attr('src', $(this).data('framesrc'));
                         });
                     }
diff --git a/lib.php b/lib.php
index ce23b448dc4aa2363beb1b0eea89b4d7205ac13d..390d9c489fe8719e8f3fab3661fb17b0c6d1e07f 100644
--- a/lib.php
+++ b/lib.php
@@ -57,6 +57,7 @@ function filter_opencast_login() {
     $params['context_id'] = $COURSE->id;
     $params['context_label'] = trim($COURSE->shortname);
     $params['context_title'] = trim($COURSE->fullname);
+    $params['resource_link_id'] = 'o' . random_int(1000,9999) . '-' . random_int(1000,9999);
     $params['resource_link_title'] = 'Opencast';
     $params['context_type'] = ($COURSE->format == 'site') ? 'Group' : 'CourseSection';
     $params['lis_person_name_given'] = $USER->firstname;
@@ -79,7 +80,6 @@ function filter_opencast_login() {
     } else {
         $params['tool_consumer_instance_name'] = get_site()->shortname;
     }
-    $params['tool_consumer_instance_description'] = trim(html_to_text(get_site()->fullname, 0));
 
     $params['launch_presentation_document_target'] = 'iframe';
     $params['oauth_signature_method'] = 'HMAC-SHA1';