diff --git a/api/js/jsapi/app_base.js b/api/js/jsapi/app_base.js
index fd6d118650..ca62263bbc 100644
--- a/api/js/jsapi/app_base.js
+++ b/api/js/jsapi/app_base.js
@@ -1606,8 +1606,8 @@ var AppJS = (function(){ "use strict"; return Class.extend(
 	mailvelopeInstallationOffer: function ()
 	{
 		var buttons = [
-			{"text": 'Install', id: 'install', image: 'check', "default":true},
-			{"text": 'Close', id:'close', image: 'cancelled'}
+			{"text": egw.lang('Install'), id: 'install', image: 'check', "default":true},
+			{"text": egw.lang('Close'), id:'close', image: 'cancelled'}
 		];
 		var dialog = function(_content, _callback)
 		{
diff --git a/api/src/Framework/Tutorial.php b/api/src/Framework/Tutorial.php
index 8a9f591c58..1b5bc14fc6 100644
--- a/api/src/Framework/Tutorial.php
+++ b/api/src/Framework/Tutorial.php
@@ -120,7 +120,7 @@ class Tutorial
 	{
 		if (!($json = Api\Cache::getCache(Api\Cache::TREE, __CLASS__, 'egw_tutorial_json')))
 		{
-			$json = file_get_contents('https://www.egroupware.de/videos/tutorials.json',
+			$json = file_get_contents('https://www.egroupware.org/videos/tutorials.json',
 				false, Api\Framework::proxy_context());
 			// Fallback tutorials.json
 			if (!$json) $json = file_get_contents('api/setup/tutorials.json');
diff --git a/api/templates/default/pgp_installation.xet b/api/templates/default/pgp_installation.xet
index 914b418ad1..43bded5f5c 100644
--- a/api/templates/default/pgp_installation.xet
+++ b/api/templates/default/pgp_installation.xet
@@ -17,11 +17,11 @@
 					<description value="Before proceeding further, we do highly recommend you to watch this short video, to see how mailvelope plugin works with EGroupware."/>
 				</row>
 				<row>
-					<video video_src="https://www.egroupware.de/videos/mailvelope_only_EN.mp4" controls="true" height="260" width="60%"/>	
+					<video video_src="https://www.egroupware.org/videos/pgp/mailvelope_only_EN.mp4" controls="true" height="260" width="60%"/>
 				</row>
 			</rows>
 		</grid>
-		
+
 		<styles>
 			video {
 				margin-left: 18%;