diff --git a/filter.php b/filter.php
index df1b269c921432af0ae34f603f8e855b2be1a462..df21c065db20af96aa6458f61a38be689dbedbe8 100644
--- a/filter.php
+++ b/filter.php
@@ -56,7 +56,8 @@ class filter_opencast extends moodle_text_filter {
 
         // Looking for tags.
         $matches = preg_split('/(<[^>]*>)/i', $text, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-
+        
+        $loginhtml = '';
         if ($matches) {
             $renderer = $PAGE->get_renderer('filter_opencast');
 
@@ -64,7 +65,7 @@ class filter_opencast extends moodle_text_filter {
             $loggedin = true;
             if (!self::$loginrendered) {
                 // Login and set cookie.
-                filter_opencast_login();
+                $loginhtml = filter_opencast_login();
                 $loggedin = false;
                 self::$loginrendered = true;
             }
@@ -113,6 +114,6 @@ class filter_opencast extends moodle_text_filter {
         }
 
         // Return the same string except processed by the above.
-        return $text;
+        return $loginhtml . $text;
     }
 }
diff --git a/lang/en/filter_opencast.php b/lang/en/filter_opencast.php
index 07a49bc932114f8402c30b4d72fa06f4ff280cb8..0a29a1f0f6f1633b1a1fc100f9b218e62300eacc 100644
--- a/lang/en/filter_opencast.php
+++ b/lang/en/filter_opencast.php
@@ -32,5 +32,4 @@ $string['setting_consumersecret_desc'] = 'LTI Consumer secret';
 $string['setting_engageurl'] = 'URL of the Opencast Engage server';
 $string['setting_engageurl_desc'] = 'If empty, the base URL of the admin tool is used.';
 $string['setting_playerurl'] = 'URL of the Opencast player';
-$string['setting_playerurl_desc'] = 'Relative URL of the Opencast player, e.g. /engage/theodul/ui/core.html for the Theodul Pass Player.';
-$string['to_the_video'] = 'Watch the video';
\ No newline at end of file
+$string['setting_playerurl_desc'] = 'Relative URL of the Opencast player, e.g. /engage/theodul/ui/core.html for the Theodul Pass Player.';
\ No newline at end of file
diff --git a/lib.php b/lib.php
index b192ce1ae8b019b18aa894910724b9feeb9aa1f1..026ce5e87f42fc58dbbeb3d56252305e5d200f4f 100644
--- a/lib.php
+++ b/lib.php
@@ -48,10 +48,12 @@ function filter_opencast_login() {
 
     // Render form.
     $renderer = $PAGE->get_renderer('filter_opencast');
-    echo $renderer->render_lti_form($endpoint, $params);
+    $html = $renderer->render_lti_form($endpoint, $params);
 
     // Submit form.
     $PAGE->requires->js_call_amd('filter_opencast/form', 'init');
+    
+    return $html;
 }
 
 /**
diff --git a/templates/player.mustache b/templates/player.mustache
index 77eca7428f0407aa5915a64aa677a51f523f9981..731483b6ead7007c2d2803e17ee1fc163e451d1c 100644
--- a/templates/player.mustache
+++ b/templates/player.mustache
@@ -30,5 +30,5 @@
     <iframe data-frameSrc="{{src}}" width="95%" height="455px" class="ocplayer" allowfullscreen="true"></iframe>
 {{/loggedin}}
 {{! Print the link to the video. }}
-<a style="display:block;" target="_blank" href="{{link}}">{{#str}} to_the_video, filter_opencast {{/str}}</a>
+<a style="display:block;" target="_blank" href="{{link}}">Zum Video</a>
 
diff --git a/version.php b/version.php
index 7b9ea634a49967509d8d5a34476bd341dfbf33f3..6706e9f7f1eae02b653eb17fa4ec723f5f0fb757 100644
--- a/version.php
+++ b/version.php
@@ -19,17 +19,17 @@
  *
  * @package    filter
  * @subpackage opencastfilter
- * @copyright  2018 Tamara Gunkel, 2020 Nina Herrmann
+ * @copyright  2018 Tamara Gunkel
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->maturity = MATURITY_RC;
-$plugin->version = 2018031902;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version = 2018031904;        // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires = 2017050500;        // Requires this Moodle version.
 $plugin->component = 'filter_opencast'; // Full name of the plugin.
 $plugin->dependencies = array(
     'block_opencast' => 2019052900, // Requires Block Opencast and Tool Opencast
     'tool_opencast' => 2018102900,
-);
\ No newline at end of file
+);