diff --git a/capsule-prototype/js/online-script.js b/capsule-prototype/js/online-script.js
index 9c88df29f59f7d4e9d908b935bfa476ef959f03d..1deedd69dd2d804bcc3bc99430a6f73178d1e553 100644
--- a/capsule-prototype/js/online-script.js
+++ b/capsule-prototype/js/online-script.js
@@ -547,7 +547,7 @@ function addLink(url) {
 
 	if(url.trim()=="") openAlert("Invalid URL");
 	else {
-		if(url!="") if(url.indexOf("http")!=0) url = "http://"+url;
+		if(url!="") if(url.indexOf("http")!=0) url = "https://"+url;
 		uploadFiles(["NewLink"+url]);
 		closeAddLinkPopup();
 	}
diff --git a/src/Controller/CapsuleController.php b/src/Controller/CapsuleController.php
index 6fbd799131d62149fc04229d95a78c87bf046a69..9a19f37f58d5d5326e7baf69d7ffefd51d516636 100755
--- a/src/Controller/CapsuleController.php
+++ b/src/Controller/CapsuleController.php
@@ -171,7 +171,6 @@ class CapsuleController extends AbstractController
             'project/project_view.html.twig',
             [
                 'url' => $url,
-                'linkHome' => $urlGenerator->generate('home', [], UrlGeneratorInterface::ABSOLUTE_URL)
             ]
         );
     }
@@ -207,17 +206,7 @@ class CapsuleController extends AbstractController
             'project/edit.html.twig',
             [
                 'url' => $url,
-                'linkHome' => $urlGenerator->generate(
-                    'home',
-                    [],
-                    UrlGeneratorInterface::ABSOLUTE_URL
-                )
-                ,
-                'linkPreview' => $urlGenerator->generate(
-                    'preview_capsule',
-                    [ 'path' => $capsule->getLinkPath() ],
-                    UrlGeneratorInterface::ABSOLUTE_URL
-                )
+                'capsule_path' => $capsule->getLinkPath()
             ]
         );
     }
diff --git a/templates/project/edit.html.twig b/templates/project/edit.html.twig
index 47ed2749375569c1c64092b2dd6465ef5ca3cde5..6e08c1c6f382252aac66a651f21d057004e02724 100644
--- a/templates/project/edit.html.twig
+++ b/templates/project/edit.html.twig
@@ -24,8 +24,8 @@
           const iframe = document.getElementById('legacyContent').contentWindow;
           iframe.app.rekall.Rekall('init', {
               links: {
-                  home: '{{ linkHome }}',
-                  projectPreview: '{{ linkPreview }}'
+                  home: '{{ absolute_url(path('home')) }}',
+                  projectPreview: '{{ absolute_url(path('preview_capsule', { 'path': capsule_path })) }}'
               }
           }
           );
diff --git a/templates/project/project_view.html.twig b/templates/project/project_view.html.twig
index 2a923da7148fc5e036e6e3b83bb446bf2523ae56..8d10ed9cfa35a469a21454d53df21169d0d4e567 100644
--- a/templates/project/project_view.html.twig
+++ b/templates/project/project_view.html.twig
@@ -44,7 +44,7 @@
 				const iframe = document.getElementById('legacyContent').contentWindow;
 				iframe.app.rekall.Rekall('init', {
 							links: {
-								home: '{{ linkHome }}'
+								home: '{{ absolute_url(path('home')) }}'
 							}
 						}
 				);