diff --git a/uninstall.php b/uninstall.php
index 4f953bf3..5433dd52 100644
--- a/uninstall.php
+++ b/uninstall.php
@@ -9,6 +9,11 @@
 $sql->setQuery('DELETE FROM `' . rex::getTable('yform_table') . '` WHERE table_name = "' . rex::getTable('ycom_user') . '"');
 $sql->setQuery('DELETE FROM `' . rex::getTable('yform_field') . '` WHERE table_name = "' . rex::getTable('ycom_user') . '"');
 $sql->setQuery('DELETE FROM `' . rex::getTable('yform_history') . '` WHERE table_name = "' . rex::getTable('ycom_user') . '"');
+if (rex_sql_table::get(rex::getTable('ycom_user_token'))->exists()) {
+    $sql->setQuery('DELETE FROM `' . rex::getTable('yform_table') . '` WHERE table_name = "' . rex::getTable('ycom_user_token') . '"');
+    $sql->setQuery('DELETE FROM `' . rex::getTable('yform_field') . '` WHERE table_name = "' . rex::getTable('ycom_user_token') . '"');
+    $sql->setQuery('DELETE FROM `' . rex::getTable('yform_history') . '` WHERE table_name = "' . rex::getTable('ycom_user_token') . '"');
+}
 
 rex_sql_table::get(rex::getTable('article'))
     ->removeColumn('ycom_auth_type')
@@ -19,6 +24,10 @@
 rex_sql_table::get(rex::getTable('ycom_user_session'))
     ->drop();
 
+if (rex_sql_table::exists(rex::getTable('ycom_user_token'))) {
+    rex_sql_table::get(rex::getTable('ycom_user_token'))->drop();
+}
+
 rex_sql_table::get(rex::getTable('ycom_user'))
     ->drop();