diff --git a/modules/shared.py b/modules/shared.py
index b651cd626..c0f712c9e 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -42,9 +42,8 @@ parser.add_argument("--show-negative-prompt", action='store_true', help="does no
 parser.add_argument("--ui-config-file", type=str, help="filename to use for ui configuration", default=os.path.join(script_path, 'ui-config.json'))
 parser.add_argument("--hide-ui-dir-config", action='store_true', help="hide directory configuration from webui", default=False)
 parser.add_argument("--ui-settings-file", type=str, help="filename to use for ui settings", default=os.path.join(script_path, 'config.json'))
-parser.add_argument("--gradio-debug", action='store_true', help="launch gradio with --debug option")
-parser.add_argument("--gradio-username", type=str, help="username for gradio authentication; default: user", default="user")
-parser.add_argument("--gradio-password", type=str, help="password for gradio authentication; default: no authentication", default=None)
+parser.add_argument("--gradio-debug",  action='store_true', help="launch gradio with --debug option")
+parser.add_argument("--gradio-auth", type=str, help='set gradio authentication like "username:password"; or comma-delimit multiple like "u1:p1,u2:p2,u3:p3"', default=None)
 
 cmd_opts = parser.parse_args()
 
diff --git a/webui.py b/webui.py
index 735ad3360..1eac91785 100644
--- a/webui.py
+++ b/webui.py
@@ -120,7 +120,7 @@ def webui():
         server_name="0.0.0.0" if cmd_opts.listen else None,
         server_port=cmd_opts.port,
         debug=cmd_opts.gradio_debug,
-        auth=(cmd_opts.gradio_username, cmd_opts.gradio_password) if cmd_opts.gradio_password is not None else None,
+        auth=[tuple(cred.split(':')) for cred in cmd_opts.auth.strip('"').split(',')] if cmd_opts.auth else None,
     )