diff --git a/plugin/bbb/install.php b/plugin/bbb/install.php
index 27150b5de2..c0527a32a6 100644
--- a/plugin/bbb/install.php
+++ b/plugin/bbb/install.php
@@ -24,6 +24,19 @@ $sql = "INSERT INTO $t_settings
     VALUES
     ('bbb_plugin_salt', '', 'textfield', 'Extra', '', 'BigBlueButtonSecuritySaltTitle','BigBlueButtonSecuritySaltComment',NULL,NULL, 1)";
 Database::query($sql);
+$table = Database::get_main_table('plugin_bbb');
+$sql = "CREATE TABLE $table ( " .
+        "id BIGINT unsigned NOT NULL auto_increment PRIMARY KEY, " .
+        "course_id INT unsigned NOT NULL DEFAULT 0, " .
+        "name VARCHAR(255) NOT NULL DEFAULT '', " .
+        "meetingname VARCHAR(255) NOT NULL DEFAULT '', " .
+        "meetingid VARCHAR(255) NOT NULL DEFAULT '', " .
+        "attendeepw VARCHAR(255) NOT NULL DEFAULT '', " .
+        "moderatorpw VARCHAR(255) NOT NULL DEFAULT '', " .
+        "autologin VARCHAR(255) NOT NULL DEFAULT '', " .
+        "newwindow VARCHAR(255) NOT NULL DEFAULT '', " .
+        "welcomemsg VARCHAR(255) NOT NULL DEFAULT '')";
+Database::query($sql);
 // update existing courses to add conference settings
 $t_courses = Database::get_main_table(TABLE_MAIN_COURSE);
 $sql = "SELECT id, code, db_name FROM $t_courses ORDER BY id";
diff --git a/plugin/bbb/uninstall.php b/plugin/bbb/uninstall.php
index 24e3451ebe..9327fca317 100644
--- a/plugin/bbb/uninstall.php
+++ b/plugin/bbb/uninstall.php
@@ -14,6 +14,8 @@ $sql = "DELETE FROM $t_settings WHERE variable = 'bbb_plugin_host'";
 Database::query($sql);
 $sql = "DELETE FROM $t_settings WHERE variable = 'bbb_plugin_salt'";
 Database::query($sql);
+$sql = "DROP TABLE plugin_bbb";
+Database::query($sql);
 // update existing courses to add conference settings
 $t_courses = Database::get_main_table(TABLE_MAIN_COURSE);
 $sql = "SELECT id, code, db_name FROM $t_courses ORDER BY id";