diff --git a/public/include/classes/invitation.class.php b/public/include/classes/invitation.class.php
index 1d02caa8..40399477 100644
--- a/public/include/classes/invitation.class.php
+++ b/public/include/classes/invitation.class.php
@@ -117,7 +117,7 @@ class Invitation extends Base {
     $aData['username'] = $this->user->getUserName($account_id);
     $aData['subject'] = 'Pending Invitation';
     if ($this->mail->sendMail('invitations/body', $aData)) {
-      $aToken = $this->token->getToken($aData['token']);
+      $aToken = $this->token->getToken($aData['token'], 'invitation');
       if (!$this->createInvitation($account_id, $aData['email'], $aToken['id']))
         return false;
       return true;
diff --git a/public/include/classes/token.class.php b/public/include/classes/token.class.php
index 42b07a2c..0bd73196 100644
--- a/public/include/classes/token.class.php
+++ b/public/include/classes/token.class.php
@@ -11,7 +11,11 @@ class Token Extends Base {
    * @param name string Setting name
    * @return value string Value
    **/
-  public function getToken($strToken) {
+  public function getToken($strToken, $strType=NULL) {
+    if (empty($strType) || ! $iToken_id = $this->tokentype->getTypeId($strType)) {
+      $this->setErrorMessage('Invalid token type: ' . $strType);
+      return false;
+    }
     $stmt = $this->mysqli->prepare("SELECT * FROM $this->table WHERE token = ? LIMIT 1");
     if ($stmt && $stmt->bind_param('s', $strToken) && $stmt->execute() && $result = $stmt->get_result())
       return $result->fetch_assoc();
diff --git a/public/include/classes/user.class.php b/public/include/classes/user.class.php
index 16502af2..b75ffa0d 100644
--- a/public/include/classes/user.class.php
+++ b/public/include/classes/user.class.php
@@ -491,7 +491,10 @@ class User extends Base {
       return false;
     }
     if (isset($strToken) && !empty($strToken)) {
-      $aToken = $this->token->getToken($strToken);
+      if ( ! $aToken = $this->token->getToken($strToken, 'invitation')) {
+        $this->setErrorMessage('Unable to find token');
+        return false;
+      }
       // Circle dependency, so we create our own object here
       $invitation = new Invitation();
       $invitation->setMysql($this->mysqli);
@@ -567,7 +570,7 @@ class User extends Base {
    **/
   public function resetPassword($token, $new1, $new2) {
     $this->debug->append("STA " . __METHOD__, 4);
-    if ($aToken = $this->token->getToken($token)) {
+    if ($aToken = $this->token->getToken($token, 'password_reset')) {
       if ($new1 !== $new2) {
         $this->setErrorMessage( 'New passwords do not match' );
         return false;
@@ -588,7 +591,7 @@ class User extends Base {
         $this->setErrorMessage('Unable to set new password');
       }
     } else {
-      $this->setErrorMessage('Invalid token');
+      $this->setErrorMessage('Invalid token: ' . $this->token->getError());
     }
     $this->debug->append('Failed to update password:' . $this->mysqli->error);
     return false;
diff --git a/public/include/pages/account/confirm.inc.php b/public/include/pages/account/confirm.inc.php
index 3611c5de..d1917e70 100644
--- a/public/include/pages/account/confirm.inc.php
+++ b/public/include/pages/account/confirm.inc.php
@@ -6,8 +6,8 @@ if (!defined('SECURITY')) die('Hacking attempt');
 // Confirm an account by token
 if (!isset($_GET['token']) || empty($_GET['token'])) {
   $_SESSION['POPUP'][] = array('CONTENT' => 'Missing token', 'TYPE' => 'errormsg');
-} else if (!$aToken = $oToken->getToken($_GET['token'])) {
-  $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to activate your account. Invalid token', 'TYPE' => 'errormsg');
+} else if (!$aToken = $oToken->getToken($_GET['token'], 'confirm_email')) {
+  $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to activate your account. Invalid token.', 'TYPE' => 'errormsg');
 } else {
   $user->changeLocked($aToken['account_id']);
   $oToken->deleteToken($aToken['token']);