diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
index 8537cc77dca..f7574d42e03 100644
--- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
@@ -747,12 +747,12 @@ class TableTableModel extends AbstractTableModel {
             case 9:
                 switch (tables[arg0].getTableState()) {
 
-//                    case WAITING:
-//                        String owner = tables[arg0].getControllerName();
-//                        if (session != null && owner.equals(session.getUserName())) {
-//                            return "Remove";
-//                        }
-//                        return "Join";
+                    case WAITING:
+                        String owner = tables[arg0].getControllerName();
+                        if (session != null && owner.equals(session.getUserName())) {
+                            return "";
+                        }
+                        return "Join";
                     case CONSTRUCTING:
                     case DRAFTING:
                         if (tables[arg0].isTournament()) {
@@ -762,10 +762,10 @@ class TableTableModel extends AbstractTableModel {
                         if (tables[arg0].isTournament()) {
                             return "Show";
                         } else {
-//                            String owner = tables[arg0].getControllerName();
-//                            if (session != null && owner.equals(session.getUserName())) {
-//                                return "Remove";
-//                            }
+                            owner = tables[arg0].getControllerName();
+                            if (session != null && owner.equals(session.getUserName())) {
+                                  return "";
+                            }
                             return "Watch";
                         }                        
                     default:
diff --git a/Mage.Server/src/main/java/mage/server/TableManager.java b/Mage.Server/src/main/java/mage/server/TableManager.java
index a8c858d0153..68a1da1265a 100644
--- a/Mage.Server/src/main/java/mage/server/TableManager.java
+++ b/Mage.Server/src/main/java/mage/server/TableManager.java
@@ -207,7 +207,7 @@ public class TableManager {
     }
 
     public boolean removeTable(UUID userId, UUID tableId) {
-        if (UserManager.getInstance().isAdmin(userId)) {
+        if (isTableOwner(tableId, userId) || UserManager.getInstance().isAdmin(userId)) {
             logger.debug("Table remove request - userId: " + userId + " tableId: " + tableId);
             TableController tableController = controllers.get(tableId);
             if (tableController != null) {
@@ -386,7 +386,7 @@ public class TableManager {
             try {
                 if (!table.getState().equals(TableState.FINISHED)) {
                     // remove tables and games not valid anymore
-                    logger.debug(table.getId() + " [" + table.getName()+ "] " + formatter.format(table.getStartTime()) +" (" + table.getState().toString() + ") " + (table.isTournament() ? "- Tournament":""));
+                    logger.debug(table.getId() + " [" + table.getName()+ "] " + formatter.format(table.getStartTime() == null ? table.getCreateTime() : table.getCreateTime()) +" (" + table.getState().toString() + ") " + (table.isTournament() ? "- Tournament":""));
                     TableController tableController = getController(table.getId());
                     if (tableController != null) {
                         if (table.isTournament()) {