More fixes for setup in ingress

diff --git a/music_assistant/controllers/webserver/controller.py b/music_assistant/controllers/webserver/controller.py
index 302ddfa9392f1384bbc02f43d602a58ef79b084f..ad62b83e916e6326ff084f65539e58066f5c45e9 100644 (file)
--- a/music_assistant/controllers/webserver/controller.py
+++ b/music_assistant/controllers/webserver/controller.py
@@ -619,8 +619,8 @@ class WebserverController(CoreController):
                 quoted_return = urllib.parse.quote(return_url, safe="")
                 setup_url = f"setup?return_url={quoted_return}"
             else:
-                # Default: redirect back to current directory (relative path)
-                setup_url = "setup?return_url=."
+                # No return URL - just redirect to setup without the parameter
+                setup_url = "setup"
             return web.Response(status=302, headers={"Location": setup_url})
 
         # Serve the Vue frontend index.html
@@ -1045,7 +1045,7 @@ class WebserverController(CoreController):
                     )
 
                 # Add password authentication to existing user
-                password_hash = builtin_provider._hash_password(password, username)
+                password_hash = builtin_provider._hash_password(password, user.user_id)
                 await self.auth.link_user_to_provider(user, AuthProviderType.BUILTIN, password_hash)
             else:
                 # Create new admin user with password