diff --git a/badge_store/main.py b/badge_store/main.py
index 3c2ed27..c45e147 100644
--- a/badge_store/main.py
+++ b/badge_store/main.py
@@ -56,7 +56,7 @@ def show_app(a):
 
     if install:
         with WaitingMessage(title="Installing %s" % a, text="Please wait...") as message:
-            installers = store.install(_get_current_apps + [a])
+            installers = store.install(_get_current_apps() + [a])
             n = len(installers)
             for i, installer in enumerate(installers):
                 message.text = "%s (%s/%s)" % (installer.path, i + 1, n)
diff --git a/lib/badge_store.py b/lib/badge_store.py
index 14197c5..2e4a825 100644
--- a/lib/badge_store.py
+++ b/lib/badge_store.py
@@ -8,7 +8,7 @@ from http import *
 import hashlib, binascii
 
 class BadgeStore:
-    def __init__(self, url = "http://badgeserver.emfcamp.org", repo="emfcamp/Mk4-Apps", ref="master"):
+    def __init__(self, url = "http://badgeserver.emfcamp.org/2018", repo="emfcamp/Mk4-Apps", ref="master"):
         self.url = url
         self.repo = repo
         self.ref = ref
diff --git a/lib/test_badge_store.py b/lib/test_badge_store.py
index e1e7e67..9e68848 100644
--- a/lib/test_badge_store.py
+++ b/lib/test_badge_store.py
@@ -10,7 +10,7 @@ from ospath import *
 class TestBadgeStore(unittest.TestCase):
 
     def setUpClass(self):
-        self.store = BadgeStore(url="http://badge.marekventur.com", repo="emfcamp/Mk4-Apps", ref="ee144e8")
+        self.store = BadgeStore(repo="emfcamp/Mk4-Apps", ref="ee144e8")
         self.download_file = "shared/test/download.txt"
 
     def tearDownClass(self):