diff --git a/libraries/src/Table/User.php b/libraries/src/Table/User.php
index 975e7b95c4ff2..1761014bb130f 100644
--- a/libraries/src/Table/User.php
+++ b/libraries/src/Table/User.php
@@ -307,6 +307,10 @@ public function check()
             }
         }
 
+        // Set an empty string value to the legacy otpKey and otep columns if empty
+        $this->otpKey = $this->otpKey ?: '';
+        $this->otep   = $this->otep ?: '';
+
         return true;
     }