diff --git a/jans-linux-setup/jans_setup/install.py b/jans-linux-setup/jans_setup/install.py
index 4106665db14..71d1ef3f6ec 100755
--- a/jans-linux-setup/jans_setup/install.py
+++ b/jans-linux-setup/jans_setup/install.py
@@ -239,8 +239,8 @@ def do_install():
     if argsp.download_exit:
         setup_args += ' --download-exit'
 
-    if argsp.args:
-        setup_cmd += ' ' + argsp.args
+    if setup_args:
+        setup_cmd += ' ' + setup_args
 
     print("Executing", setup_cmd)
     os.system(setup_cmd)
diff --git a/jans-linux-setup/jans_setup/setup_app/installers/fido.py b/jans-linux-setup/jans_setup/setup_app/installers/fido.py
index 6cac94cc4ff..0d599654abe 100644
--- a/jans-linux-setup/jans_setup/setup_app/installers/fido.py
+++ b/jans-linux-setup/jans_setup/setup_app/installers/fido.py
@@ -76,7 +76,7 @@ def copy_static(self):
 
         #copy fido2 server metadata
         self.copyTree(
-            os.path.join(Config.install_dir, 'static/auth/fido2/server_metadata'),
+            os.path.join(Config.install_dir, 'static/fido2/server_metadata'),
             os.path.join(self.fido2ConfigFolder, 'server_metadata')
             )
 
diff --git a/jans-linux-setup/jans_setup/static/fido2/server_metadata/.dontdelete b/jans-linux-setup/jans_setup/static/fido2/server_metadata/.dontdelete
new file mode 100644
index 00000000000..9e66843f627
--- /dev/null
+++ b/jans-linux-setup/jans_setup/static/fido2/server_metadata/.dontdelete
@@ -0,0 +1 @@
+fido2 metadata will go here
\ No newline at end of file