diff --git a/js/connect.js b/js/connect.js
index 077dc98..468a398 100644
--- a/js/connect.js
+++ b/js/connect.js
@@ -1,3 +1,5 @@
+import {account, functions, accountDetails} from './setup.js';
+
 account.getPrefs().then((response) => {
     if(response.user_token !== undefined) {
         message_box('info', 'You\'re already conneted! <a href="/">Go home</a>');
@@ -18,7 +20,7 @@ document.getElementById('instance-connect').addEventListener('submit', (event) =
 
     const server_url = document.getElementById('server-url').value;
 
-    functions.createExecution('servers', '{"action": "register_server", "user_id": "' + accountDetailsPromise['$id'] + '", "server_url": "' + server_url + '"}')
+    functions.createExecution('servers', '{"action": "register_server", "user_id": "' + accountDetails['$id'] + '", "server_url": "' + server_url + '"}')
     .then((res) => {
         // console.log(JSON.parse(res.response)['redirect_uri']);
         window.location.href = JSON.parse(res.response).redirect_uri;
diff --git a/redirect.php b/redirect.php
index 39969f5..00bbe4c 100644
--- a/redirect.php
+++ b/redirect.php
@@ -5,7 +5,9 @@ if(!isset($_GET['code'])) {
 require('template/header.html');
 require('template/footer.php');
 ?>
-<script>
+<script type="module">
+import {functions} from './js/setup.js';
+
 const urlparams = new URLSearchParams(window.location.search);
 
 functions.createExecution('servers', '{"action": "redirect_code", "user_id": "' + urlparams.get('user_id') + '", "code": "' + urlparams.get('code') + '"}').then((res) => {