diff --git a/controller/registercontroller.php b/controller/registercontroller.php
index a87268a..e05eff4 100644
--- a/controller/registercontroller.php
+++ b/controller/registercontroller.php
@@ -171,12 +171,12 @@ class RegisterController extends Controller {
 						'errormsgs' => array($e->message, $username, $password)), 'guest');
 				}
 
-				// Mark registered
-				$res = $this->pendingreg->setRegistered($token);
+				// Delete pending reg request
+				$res = $this->pendingreg->delete($email);
 				if ( \OCP\DB::isError($res) ) {
 					return new TemplateResponse('', 'error', array(
 						'errors' => array(array(
-							'error' => $this->l10n->t('Invalid verification URL. No registration request with this verification URL is found.'),
+							'error' => $this->l10n->t('Failed to delete pending registration request'),
 							'hint' => ''
 						))
 					), 'error');
diff --git a/db/pendingregist.php b/db/pendingregist.php
index fb190a7..c656c2b 100644
--- a/db/pendingregist.php
+++ b/db/pendingregist.php
@@ -30,14 +30,14 @@ class PendingRegist {
 		return $query->execute(array($email))->fetchAll();
 	}
 
+	public function delete($email) {
+		$query = $this->db->prepareQuery('DELETE FROM `*PREFIX*registration` WHERE `email` = ? ');
+		return $query->execute(array($email));
+	}
+
 	public function findEmailByToken($token) {
 		$query = $this->db->prepareQuery('SELECT `email` FROM `*PREFIX*registration` WHERE `token` = ? ');
 		return $query->execute(array($token))->fetchOne();
 	}
 
-	public function setRegistered($token) {
-		$query = $this->db->prepareQuery('UPDATE `*PREFIX*registration` SET `registered`=true WHERE `token` = ? ');
-		return $query->execute(array($token));
-	}
-
 }