diff --git a/appinfo/application.php b/appinfo/application.php
index 1386185..5a9d874 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -87,7 +87,7 @@ class Application extends App {
 		});
 
 		$container->registerService('PendingRegist', function(SimpleContainer $c) {
-			return new PendingRegist($c->query('ServerContainer')->getDb(),
+			return new PendingRegist($c->query('ServerContainer')->getDatabaseConnection(),
 				$c->query('ServerContainer')->getSecureRandom()->getMediumStrengthGenerator());
 		});
 
diff --git a/db/pendingregist.php b/db/pendingregist.php
index 8fe6f62..1cdb7ee 100644
--- a/db/pendingregist.php
+++ b/db/pendingregist.php
@@ -1,7 +1,7 @@
 <?php
 namespace OCA\Registration\Db;
 
-use \OCP\IDb;
+use \OCP\IDbConnection;
 use \OCP\Util;
 use \OCP\Security\ISecureRandom;
 
@@ -12,13 +12,13 @@ class PendingRegist {
 	/** @var \OCP\Security\ISecureRandom */
 	protected $random;
 
-	public function __construct(IDb $db, ISecureRandom $random) {
+	public function __construct(IDbConnection $db, ISecureRandom $random) {
 		$this->db = $db;
 		$this->random = $random;
 	}
 
 	public function save($email) {
-		$query = $this->db->prepareQuery( 'INSERT INTO `*PREFIX*registration`'
+		$query = $this->db->prepare( 'INSERT INTO `*PREFIX*registration`'
 			.' ( `email`, `token`, `requested` ) VALUES( ?, ?, NOW() )' );
 		
 		$token = $this->random->generate(6, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
@@ -27,18 +27,23 @@ class PendingRegist {
 		return $token;
 	}
 	public function find($email) {
-		$query = $this->db->prepareQuery('SELECT `email` FROM `*PREFIX*registration` WHERE `email` = ? ');
-		return $query->execute(array($email))->fetchAll();
+		$query = $this->db->prepare('SELECT `email` FROM `*PREFIX*registration` WHERE `email` = ? ');
+		$query->execute(array($email));
+		return $query->fetchAll();
 	}
 
 	public function delete($email) {
-		$query = $this->db->prepareQuery('DELETE FROM `*PREFIX*registration` WHERE `email` = ? ');
+		$query = $this->db->prepare('DELETE FROM `*PREFIX*registration` WHERE `email` = ? ');
 		return $query->execute(array($email));
 	}
 
+	/**
+	 * @return string|false
+	 */
 	public function findEmailByToken($token) {
-		$query = $this->db->prepareQuery('SELECT `email` FROM `*PREFIX*registration` WHERE `token` = ? ');
-		return $query->execute(array($token))->fetchOne();
+		$query = $this->db->prepare('SELECT `email` FROM `*PREFIX*registration` WHERE `token` = ? ');
+		$query->execute(array($token));
+		return $query->fetch()['email'];
 	}
 
 }