diff --git a/inventory-app/inventory.py b/inventory-app/inventory.py
index 34b06d2..4edd4ff 100644
--- a/inventory-app/inventory.py
+++ b/inventory-app/inventory.py
@@ -81,8 +81,9 @@ def setup_user_select(select_field, name_fields):
             name_field.data = value
 
 def setup_default_owner(select_field):
+    user = read_user()
     c = select_field.choices
-    d = [i for i in c if i[1] == "K-SPACE MTÜ"]
+    d = [i for i in c if i[0] == (user and user.get("username") or "k-space")]
     if len(d) < 1:
         return
     dv = d[0] or None