diff --git a/module/VuFind/src/VuFind/Db/Row/User.php b/module/VuFind/src/VuFind/Db/Row/User.php
index 43504c336bdf172251d94418e1d46e19b78832a6..dbc1d5bc4f5f4837ca47788f8103a8fec6dd0369 100644
--- a/module/VuFind/src/VuFind/Db/Row/User.php
+++ b/module/VuFind/src/VuFind/Db/Row/User.php
@@ -146,6 +146,11 @@ class User extends ServiceLocatorAwareGateway
      */
     protected function encryptOrDecrypt($text, $encrypt = true)
     {
+        // Ignore empty text:
+        if (empty($text)) {
+            return $text;
+        }
+
         // Load encryption key from configuration if not already present:
         if (null === $this->encryptionKey) {
             $config = $this->getServiceLocator()->getServiceLocator()