diff --git a/admin.py b/admin.py
index b3dc822..69d6925 100644
--- a/admin.py
+++ b/admin.py
@@ -82,8 +82,9 @@ def page_admin():
                         userlist = list_users()
                         ui.markdown("Benutzer:")
 
-                        time_user = ui.select(options=userlist, value=userlist[0], on_change=update_user)
 
+                        time_user = ui.select(options=userlist, on_change=update_user)
+                        time_user.value = userlist[0]
                         user_to_select_for_start = userlist[0]
 
                         current_year = datetime.datetime.now().year
diff --git a/homepage.py b/homepage.py
index 2aa6540..75e866e 100644
--- a/homepage.py
+++ b/homepage.py
@@ -18,7 +18,11 @@ def homepage():
     if login_is_valid():
 
         ui.page_title("Zeiterfassung")
-        current_user = user(app.storage.user["active_user"])
+        try:
+            current_user = user(app.storage.user["active_user"])
+        except:
+            del(app.storage.user["active_user"])
+            ui.navigate.to('/')
         pageheader(f"Willkommen, {current_user.fullname}")
 
         today = datetime.datetime.now()
diff --git a/main.py b/main.py
index 1b73ccf..937b047 100644
--- a/main.py
+++ b/main.py
@@ -14,12 +14,12 @@ import json
 def main():
 
     # Einstellungen einlesen
-    with open(f"{scriptpath}/settings.json") as json_file:
-        data = json.load(json_file)
-
+    data = load_adminsettings()
     port = int(data["port"])
     secret = data["secret"]
 
+    list_users()
+
     homepage()
 
     def startup_message():
diff --git a/users.py b/users.py
index 34fba12..d3fa4f4 100644
--- a/users.py
+++ b/users.py
@@ -375,14 +375,19 @@ class user:
         print(total_time)
         print(in_time_stamp)
 
-        return([total_time, in_time_stamp])
+        return [total_time, in_time_stamp]
 
 # Benutzer auflisten
 def list_users():
+
+    if not os.path.exists(userfolder):
+        os.makedirs(userfolder)
+
     users = [d for d in os.listdir(userfolder) if os.path.isdir(os.path.join(userfolder, d))]
     users.sort()
     return users
 
+
 # Admineinstellungen auslesen
 def load_adminsettings():
     # Settingsdatei einlesen
@@ -390,8 +395,6 @@ def load_adminsettings():
         with open(f"{scriptpath}/{usersettingsfilename}") as json_file:
             data = json.load(json_file)
         json_file.close()
-        return(data)
+        return data
     except:
-        return(-1)
-
-
+        return -1
\ No newline at end of file