diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index a0eed9d1..2a9d6b0e 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -118,15 +118,42 @@ function css() {
 	*/
 	function loginForm() {
 		global $drivers;
+
 		echo "<table cellspacing='0' class='layout'>\n";
-		echo $this->loginFormField('driver', '<tr><th>' . lang('System') . '<td>', html_select("auth[driver]", $drivers, DRIVER, "loginDriver(this);") . "\n");
-		echo $this->loginFormField('server', '<tr><th>' . lang('Server') . '<td>', '<input name="auth[server]" value="' . h(SERVER) . '" title="hostname[:port]" placeholder="localhost" autocapitalize="off">' . "\n");
-		echo $this->loginFormField('username', '<tr><th>' . lang('Username') . '<td>', '<input name="auth[username]" id="username" value="' . h($_GET["username"]) . '" autocomplete="username" autocapitalize="off">' . script("focus(qs('#username')); qs('#username').form['auth[driver]'].onchange();"));
-		echo $this->loginFormField('password', '<tr><th>' . lang('Password') . '<td>', '<input type="password" name="auth[password]" autocomplete="current-password">' . "\n");
+        echo $this->loginFormField('driver', '<tr><th>' . lang('System') . '<td>', html_select("auth[driver]", $drivers, DRIVER, "loginDriver(this);"));
+		echo $this->loginFormField('server', '<tr><th>' . lang('Server') . '<td>', '<input id="serverfield" name="auth[server]" value="' . h(SERVER) . '" title="hostname[:port]" placeholder="localhost" autocapitalize="off">' . "\n");
+		echo $this->loginFormField('username', '<tr><th>' . lang('Username') . '<td>', '<input id="usernamefield" name="auth[username]" id="username" value="' . h($_GET["username"]) . '" autocomplete="username" autocapitalize="off">' . script("focus(qs('#username')); qs('#username').form['auth[driver]'].onchange();"));
+		echo $this->loginFormField('password', '<tr><th>' . lang('Password') . '<td>', '<input id="passwordfield" type="password" name="auth[password]" autocomplete="current-password">' . "\n");
 		echo $this->loginFormField('db', '<tr><th>' . lang('Database') . '<td>', '<input name="auth[db]" value="' . h($_GET["db"]) . '" autocapitalize="off">' . "\n");
 		echo "</table>\n";
 		echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
 		echo checkbox("auth[permanent]", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
+
+        echo script("
+        window.addEventListener('load', (event) => {
+            var authDriverSelect = document.getElementById('auth_driver');
+            var serverFieldRow = document.getElementById('serverfield').closest('tr');
+            var usernameFieldRow = document.getElementById('usernamefield').closest('tr');
+            var passwordFieldRow = document.getElementById('passwordfield').closest('tr');
+
+            function toggleFields() {
+                console.debug('toggleFields')
+                if (authDriverSelect.value === 'sqlite' || authDriverSelect.value === 'sqlite2') {
+                    passwordFieldRow.style.display = 'none';
+                    serverFieldRow.style.display = 'none';
+                    usernameFieldRow.style.display = 'none';
+                } else {
+                    passwordFieldRow.style.display = '';
+                    serverFieldRow.style.display = '';
+                    usernameFieldRow.style.display = '';
+                }
+            }
+
+            authDriverSelect.addEventListener('change', toggleFields);
+
+            toggleFields();
+        });");
+
 	}
 
 	/** Get login form field
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 6565375a..fa1488d0 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -220,6 +220,7 @@ function optionlist($options, $selected = null, $use_keys = false) {
 function html_select($name, $options, $value = "", $onchange = true, $labelled_by = "") {
 	if ($onchange) {
 		return "<select name='" . h($name) . "'"
+            . ($onchange === "loginDriver(this);" ? " id='auth_driver' " : "")
 			. ($labelled_by ? " aria-labelledby='$labelled_by'" : "")
 			. ">" . optionlist($options, $value) . "</select>"
 			. (is_string($onchange) ? script("qsl('select').onchange = function () { $onchange };", "") : "")
diff --git a/adminer/include/version.inc.php b/adminer/include/version.inc.php
index 47ef639c..9205a216 100644
--- a/adminer/include/version.inc.php
+++ b/adminer/include/version.inc.php
@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.8.4";
+$VERSION = "4.9.1";
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 00000000..7890a071
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,18 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "916a4c5c6dde1f0677e54e2bc7cbe060",
+    "packages": [],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": [],
+    "plugin-api-version": "2.6.0"
+}