diff --git a/cli/nvidia-smi.py b/cli/nvidia-smi.py
old mode 100644
new mode 100755
index 349f7f50f..f7b11311a
--- a/cli/nvidia-smi.py
+++ b/cli/nvidia-smi.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 import os
 import json
 import shutil
diff --git a/installer.py b/installer.py
index c1fa1b369..92f1e7584 100644
--- a/installer.py
+++ b/installer.py
@@ -599,7 +599,6 @@ def add_args():
     group.add_argument('--debug', default = False, action='store_true', help = "Run installer with debug logging, default: %(default)s")
     group.add_argument('--reset', default = False, action='store_true', help = "Reset main repository to latest version, default: %(default)s")
     group.add_argument('--upgrade', default = False, action='store_true', help = "Upgrade main repository to latest version, default: %(default)s")
-    group.add_argument('--api-only', default = False, action='store_true', help = "Run in API only mode without starting UI")
     group.add_argument("--use-ipex", default = False, action='store_true', help="Use Intel OneAPI XPU backend, default: %(default)s")
     group.add_argument('--use-directml', default = False, action='store_true', help = "Use DirectML if no compatible GPU is detected, default: %(default)s")
     group.add_argument("--use-cuda", default=False, action='store_true', help="Force use nVidia CUDA backend, default: %(default)s")
diff --git a/modules/api/api.py b/modules/api/api.py
index a9bd608c2..f6bf7f472 100644
--- a/modules/api/api.py
+++ b/modules/api/api.py
@@ -93,6 +93,15 @@ class Api:
             for auth in shared.cmd_opts.api_auth.split(","):
                 user, password = auth.split(":")
                 self.credentials[user] = password
+        else:
+            if shared.cmd_opts.auth:
+                user, password = [x.strip() for x in shared.cmd_opts.auth.strip('"').replace('\n', '').split(',') if x.strip()]
+                self.credentials[user] = password
+            if shared.cmd_opts.authfile:
+                with open(shared.cmd_opts.authfile, 'r', encoding="utf8") as file:
+                    for line in file.readlines():
+                        user, password = [x.strip() for x in line.split(',') if x.strip()]
+                        self.credentials[user] = password
         self.router = APIRouter()
         self.app = app
         self.queue_lock = queue_lock
diff --git a/modules/cmd_args.py b/modules/cmd_args.py
index 6a395dcdb..b1541f608 100644
--- a/modules/cmd_args.py
+++ b/modules/cmd_args.py
@@ -25,6 +25,7 @@ group.add_argument("--freeze", action='store_true', help="Disable editing settin
 group.add_argument("--auth", type=str, help='Set access authentication like "user:pwd,user:pwd""', default=None)
 group.add_argument("--authfile", type=str, help='Set access authentication using file, default: %(default)s', default=None)
 group.add_argument("--autolaunch", action='store_true', help="Open the UI URL in the system's default browser upon launch", default=False)
+group.add_argument('--api-only', default = False, action='store_true', help = "Run in API only mode without starting UI")
 group.add_argument("--api-auth", type=str, help='Set API authentication, default: %(default)s', default=None)
 group.add_argument("--api-log", default=False, action='store_true', help="Enable logging of all API requests, default: %(default)s")
 group.add_argument("--device-id", type=str, help="Select the default CUDA device to use, default: %(default)s", default=None)