diff --git a/filebrowser/run.sh b/filebrowser/run.sh
index 7bd9c35a6..e2c94459f 100644
--- a/filebrowser/run.sh
+++ b/filebrowser/run.sh
@@ -151,11 +151,15 @@ PGID=0
 ######################
 # LAUNCH FILEBROWSER #
 ######################
-bashio::log.info "Default username/password : admin/admin"
-bashio::log.info "Please wait 1 or 2 minutes to allow the server to load"
 
 if bashio::config.true 'NoAuth'; then
   filebrowser config set --auth.method=noauth
+  bashio::log.info "NoAuth option selected"
+else
+  filebrowser config set --auth.method=json
+  bashio::log.info "Default username/password : admin/admin"
 fi
 
+bashio::log.info "Please wait 1 or 2 minutes to allow the server to load"
+
 /./filebrowser $CERTFILE $KEYFILE --root=/ --address=0.0.0.0 --database=/config/filebrowser/filebrowser.dB