diff --git a/e107_plugins/forum/forum_update.php b/e107_plugins/forum/forum_update.php
index 798a2917b..707ad7839 100644
--- a/e107_plugins/forum/forum_update.php
+++ b/e107_plugins/forum/forum_update.php
@@ -190,11 +190,18 @@ function step2()
 	$ret = '';
 	$failed = false;
 	$text = '';
+	$sql = e107::getDb();
 	foreach ($tabList as $name => $rename)
 	{
 		$message = 'Creating table ' . ($rename ? $rename : $name);
 
-		$result = $db -> createTable(e_PLUGIN . 'forum/forum_sql.php', $name, true, $rename);
+		if($sql->isTable($name) && $sql->isEmpty($name))
+		{
+			$mes -> addSuccess("Skipping table ".$name." (already exists)");
+			continue;
+		}
+
+		$result = $db->createTable(e_PLUGIN . 'forum/forum_sql.php', $name, true, $rename);
 		if ($result === true)
 		{
 			$mes -> addSuccess($message);
@@ -221,9 +228,9 @@ function step2()
 	$ns -> tablerender('Step 2: Forum table creation', $mes -> render() . $text);
 }
 
-// FIXME - use e107::getPlugin()->manage_extended_field('add', $name, $attrib,
-// $source)
 
+
+// FIXME - use e107::getPlugin()->manage_extended_field('add', $name, $attrib, $source)
 function step3()
 {
 	$ns = e107::getRender();