diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionPlayerTableValueTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionPlayerTableValueTable.java
index 1690ef8dc..eea1479ca 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionPlayerTableValueTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionPlayerTableValueTable.java
@@ -50,7 +50,7 @@ public class ExtensionPlayerTableValueTable {
         return CreateTableBuilder.create(TABLE_NAME, dbType)
                 .column(ID, INT).primaryKey()
                 .column(USER_UUID, Sql.varchar(36)).notNull()
-                .column(ROW_NUMBER, INT).notNull()
+                .column(ROW_NUMBER, INT).notNull().defaultValue("0")
                 .column(VALUE_1, Sql.varchar(250))
                 .column(VALUE_2, Sql.varchar(250))
                 .column(VALUE_3, Sql.varchar(250))
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionServerTableValueTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionServerTableValueTable.java
index bde76fc27..034438137 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionServerTableValueTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionServerTableValueTable.java
@@ -51,7 +51,7 @@ public class ExtensionServerTableValueTable {
         return CreateTableBuilder.create(TABLE_NAME, dbType)
                 .column(ID, INT).primaryKey()
                 .column(SERVER_UUID, Sql.varchar(36)).notNull()
-                .column(ROW_NUMBER, INT).notNull()
+                .column(ROW_NUMBER, INT).notNull().defaultValue("0")
                 .column(VALUE_1, Sql.varchar(250))
                 .column(VALUE_2, Sql.varchar(250))
                 .column(VALUE_3, Sql.varchar(250))
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionTableProviderTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionTableProviderTable.java
index fc587d846..226284715 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionTableProviderTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionTableProviderTable.java
@@ -79,7 +79,7 @@ public class ExtensionTableProviderTable {
                 .column(ID, INT).primaryKey()
                 .column(PROVIDER_NAME, Sql.varchar(50)).notNull()
                 .column(COLOR, Sql.varchar(25)).notNull().defaultValue("'" + Color.NONE.name() + "'")
-                .column(VALUES_FOR, INT)
+                .column(VALUES_FOR, INT).defaultValue("0")
                 .column(CONDITION, Sql.varchar(54)) // 50 + 4 for "not_"
                 .column(COL_1, Sql.varchar(50))
                 .column(COL_2, Sql.varchar(50))
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/PlayerTableValuesRowNumberPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/PlayerTableValuesRowNumberPatch.java
index 2210163f2..adb7483e5 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/PlayerTableValuesRowNumberPatch.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/PlayerTableValuesRowNumberPatch.java
@@ -31,7 +31,9 @@ import java.util.Map;
 
 import static com.djrapitops.plan.storage.database.sql.building.Sql.*;
 import static com.djrapitops.plan.storage.database.sql.tables.ExtensionPlayerTableValueTable.ID;
-import static com.djrapitops.plan.storage.database.sql.tables.ExtensionPlayerTableValueTable.*;
+import static com.djrapitops.plan.storage.database.sql.tables.ExtensionPlayerTableValueTable.TABLE_ID;
+import static com.djrapitops.plan.storage.database.sql.tables.ExtensionServerTableValueTable.ROW_NUMBER;
+import static com.djrapitops.plan.storage.database.sql.tables.ExtensionServerTableValueTable.TABLE_NAME;
 
 public class PlayerTableValuesRowNumberPatch extends Patch {
 
@@ -65,8 +67,14 @@ public class PlayerTableValuesRowNumberPatch extends Patch {
 
     @Override
     protected void applyPatch() {
-        addColumn(TABLE_NAME, ROW_NUMBER + ' ' + Sql.INT + " NOT NULL DEFAULT 0");
+        if (!hasColumn(TABLE_NAME, ROW_NUMBER)) {
+            addColumn(TABLE_NAME, ROW_NUMBER + ' ' + Sql.INT + " NOT NULL DEFAULT 0");
+        }
 
+        updateRowIds();
+    }
+
+    private void updateRowIds() {
         String updateRowId = "UPDATE " + TABLE_NAME + " SET " +
                 ROW_NUMBER + "=?" +
                 WHERE + ID + "=?";
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ServerTableValuesRowNumberPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ServerTableValuesRowNumberPatch.java
index 9abb6e8ec..9ad2fe338 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ServerTableValuesRowNumberPatch.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ServerTableValuesRowNumberPatch.java
@@ -65,8 +65,14 @@ public class ServerTableValuesRowNumberPatch extends Patch {
 
     @Override
     protected void applyPatch() {
-        addColumn(TABLE_NAME, ROW_NUMBER + ' ' + Sql.INT + " NOT NULL DEFAULT 0");
+        if (!hasColumn(TABLE_NAME, ROW_NUMBER)) {
+            addColumn(TABLE_NAME, ROW_NUMBER + ' ' + Sql.INT + " NOT NULL DEFAULT 0");
+        }
 
+        updateRowIds();
+    }
+
+    private void updateRowIds() {
         String updateRowId = "UPDATE " + TABLE_NAME + " SET " +
                 ROW_NUMBER + "=?" +
                 WHERE + ID + "=?";