diff --git a/daemon_get.py b/daemon_get.py
index 98ed67e27..ddece8c46 100644
--- a/daemon_get.py
+++ b/daemon_get.py
@@ -3633,7 +3633,10 @@ def daemon_http_get(self) -> None:
                        self.server.base_dir,
                        self.server.domain,
                        cookie,
-                       self.server.theme_name):
+                       self.server.theme_name,
+                       self.server.access_keys,
+                       self.server.key_shortcuts,
+                       self.server.default_timeline):
             self.server.getreq_busy = False
             return
 
diff --git a/daemon_get_links.py b/daemon_get_links.py
index 6b3b7cb4a..f84e3d117 100644
--- a/daemon_get_links.py
+++ b/daemon_get_links.py
@@ -15,7 +15,9 @@ from httpcodes import http_404
 
 def edit_links2(self, calling_domain: str, path: str,
                 translate: {}, base_dir: str,
-                domain: str, cookie: str, theme: str) -> bool:
+                domain: str, cookie: str, theme: str,
+                access_keys: {}, key_shortcuts: {},
+                default_timeline: str) -> bool:
     """Show the links from the left column
     """
     if '/users/' in path and path.endswith('/editlinks'):
@@ -23,14 +25,13 @@ def edit_links2(self, calling_domain: str, path: str,
         if '/' in nickname:
             nickname = nickname.split('/')[0]
 
-        access_keys = self.server.access_keys
-        if self.server.key_shortcuts.get(nickname):
-            access_keys = self.server.key_shortcuts[nickname]
+        if key_shortcuts.get(nickname):
+            access_keys = key_shortcuts[nickname]
 
         msg = html_edit_links(translate,
                               base_dir,
                               path, domain,
-                              self.server.default_timeline,
+                              default_timeline,
                               theme, access_keys)
         if msg:
             msg = msg.encode('utf-8')