diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 611c43ddc..a18f77cd6 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -70,7 +70,6 @@ CREATE TABLE `tblUsers` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `login` varchar(50) DEFAULT NULL,
   `pwd` varchar(255) DEFAULT NULL,
-  `webauthn` text DEFAULT NULL,
   `secret` varchar(50) DEFAULT NULL,
   `fullName` varchar(100) DEFAULT NULL,
   `email` varchar(70) DEFAULT NULL,
diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index 66292bd1e..015e212f5 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -65,7 +65,6 @@ CREATE TABLE "tblUsers" (
   "id" SERIAL UNIQUE,
   "login" varchar(50) default NULL,
   "pwd" varchar(255) default NULL,
-  "webauthn" text default NULL,
   "secret" varchar(50) default NULL,
   "fullName" varchar(100) default NULL,
   "email" varchar(70) default NULL,
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index ed8cae33a..d0d9ac18e 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -66,7 +66,6 @@ CREATE TABLE `tblUsers` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `login` varchar(50) default NULL,
   `pwd` varchar(255) default NULL,
-  `webauthn` TEXT default NULL,
   `secret` varchar(50) default NULL,
   `fullName` varchar(100) default NULL,
   `email` varchar(70) default NULL,
diff --git a/install/update-6.1.0/update-postgres.sql b/install/update-6.1.0/update-postgres.sql
index cb21210b3..71dbf93c2 100644
--- a/install/update-6.1.0/update-postgres.sql
+++ b/install/update-6.1.0/update-postgres.sql
@@ -8,8 +8,6 @@ ALTER TABLE "tblUserPasswordHistory" ALTER COLUMN "pwd" varchar(255) DEFAULT NUL
 
 ALTER TABLE "tblUserPasswordRequest" ALTER COLUMN "hash" varchar(255) DEFAULT NULL;
 
-ALTER TABLE "tblUsers" ADD COLUMN "webauthn" TYPE text DEFAULT NULL;
-
 ALTER TABLE "tblUsers" ADD COLUMN "disabledUntil" TYPE TIMESTAMP DEFAULT NULL;
 
 ALTER TABLE "tblDocuments" ADD COLUMN "startdate" TIMESTAMP default NULL;
diff --git a/install/update-6.1.0/update-sqlite3.sql b/install/update-6.1.0/update-sqlite3.sql
index a25b81da8..39b0662c2 100644
--- a/install/update-6.1.0/update-sqlite3.sql
+++ b/install/update-6.1.0/update-sqlite3.sql
@@ -38,8 +38,6 @@ DROP TABLE `tblUsers`;
 
 ALTER TABLE `new_tblUsers` RENAME TO `tblUsers`;
 
-ALTER TABLE `tblUsers` ADD COLUMN `webauthn` TEXT DEFAULT NULL;
-
 ALTER TABLE `tblUsers` ADD COLUMN `disabledUntil` TEXT DEFAULT NULL;
 
 CREATE TABLE `new_tblUserPasswordRequest` (
diff --git a/install/update-6.1.0/update.sql b/install/update-6.1.0/update.sql
index 760868d17..6cc49a573 100644
--- a/install/update-6.1.0/update.sql
+++ b/install/update-6.1.0/update.sql
@@ -8,8 +8,6 @@ ALTER TABLE `tblUserPasswordHistory` CHANGE `pwd` `pwd` varchar(255) DEFAULT NUL
 
 ALTER TABLE `tblUserPasswordRequest` CHANGE `hash` `hash` varchar(255) DEFAULT NULL;
 
-ALTER TABLE `tblUsers` ADD COLUMN `webauthn` text DEFAULT NULL AFTER `pwd`;
-
 ALTER TABLE `tblUsers` ADD COLUMN `disabledUntil` datetime DEFAULT NULL AFTER `disabled`;
 
 ALTER TABLE `tblDocuments` ADD COLUMN `enddate` datetime DEFAULT NULL AFTER `sequence`;
diff --git a/op/op.Login.php b/op/op.Login.php
index 31b0b3d8b..a8b2c67ef 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -28,7 +28,6 @@ include("../inc/inc.ClassSession.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
-require_once("../inc/inc.WebAuthn.php");
 
 include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
 
@@ -92,24 +91,11 @@ $controller->setParam('sesstheme', $sesstheme);
 $controller->setParam('referuri', $referuri);
 $controller->setParam('session', $session);
 $controller->setParam('authenticator', $authenticator);
-$action = !empty($_POST['action']) ? $_POST['action'] : '';
-switch($action) {
-/* preparelogin() and login() are both called by ajax */
-case 'preparelogin':
-	$controller->preparelogin();
-	exit();
-	break;
-case 'login':
-	$controller->login();
-	exit();
-	break;
-default:
-	if(!$controller()) {
-		$session = null;
-		add_log_line("login failed", PEAR_LOG_ERR);
-		_printMessage(getMLText($controller->getErrorMsg()), getMLText($controller->getErrorMsg())."\n");
-		exit;
-	}
+if(!$controller()) {
+	$session = null;
+	add_log_line("login failed", PEAR_LOG_ERR);
+	_printMessage(getMLText($controller->getErrorMsg()), getMLText($controller->getErrorMsg())."\n");
+	exit;
 }
 
 $user = $controller->getUser();