diff --git a/model/version.go b/model/version.go
index 6020d5f8e1..93f6a3f85f 100644
--- a/model/version.go
+++ b/model/version.go
@@ -13,6 +13,7 @@ import (
 // It should be maintained in chronological order with most current
 // release at the front of the list.
 var versions = []string{
+	"6.4.0",
 	"6.3.0",
 	"6.2.0",
 	"6.1.0",
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go
index ef84eebb4b..e4014b6f6a 100644
--- a/store/sqlstore/upgrade.go
+++ b/store/sqlstore/upgrade.go
@@ -18,6 +18,7 @@ import (
 
 const (
 	CurrentSchemaVersion   = Version630
+	Version640             = "6.4.0"
 	Version630             = "6.3.0"
 	Version620             = "6.2.0"
 	Version610             = "6.1.0"
@@ -220,6 +221,7 @@ func upgradeDatabase(sqlStore *SqlStore, currentModelVersionString string) error
 	upgradeDatabaseToVersion610(sqlStore)
 	upgradeDatabaseToVersion620(sqlStore)
 	upgradeDatabaseToVersion630(sqlStore)
+	upgradeDatabaseToVersion640(sqlStore)
 
 	return nil
 }
@@ -1429,3 +1431,13 @@ func upgradeDatabaseToVersion630(sqlStore *SqlStore) {
 		saveSchemaVersion(sqlStore, Version630)
 	}
 }
+
+func upgradeDatabaseToVersion640(sqlStore *SqlStore) {
+	// if shouldPerformUpgrade(sqlStore, Version630, Version640) {
+	if sqlStore.DoesColumnExist("Users", "AcceptedTermsOfServiceId") {
+		sqlStore.GetMaster().ExecNoTimeout("ALTER TABLE Users DROP COLUMN AcceptedTermsOfServiceId")
+	}
+
+	// 	saveSchemaVersion(sqlStore, Version630)
+	// }
+}