diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/dbsupport/clickhouse/ClickHouseDbSupport.java b/flyway-core/src/main/java/org/flywaydb/core/internal/dbsupport/clickhouse/ClickHouseDbSupport.java
index 1d678c27ef..7e01fd9645 100644
--- a/flyway-core/src/main/java/org/flywaydb/core/internal/dbsupport/clickhouse/ClickHouseDbSupport.java
+++ b/flyway-core/src/main/java/org/flywaydb/core/internal/dbsupport/clickhouse/ClickHouseDbSupport.java
@@ -60,7 +60,7 @@ protected void doChangeCurrentSchemaTo(String schema) throws SQLException {
     @Override
     public String getCurrentUserFunction() {
         // ClickHouse doesn't appear to have any concept of users
-        return "null";
+        return null;
     }
 
     @Override
diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/metadatatable/MetaDataTableImpl.java b/flyway-core/src/main/java/org/flywaydb/core/internal/metadatatable/MetaDataTableImpl.java
index 397f8a6943..47a0f829aa 100644
--- a/flyway-core/src/main/java/org/flywaydb/core/internal/metadatatable/MetaDataTableImpl.java
+++ b/flyway-core/src/main/java/org/flywaydb/core/internal/metadatatable/MetaDataTableImpl.java
@@ -230,13 +230,14 @@ public void addAppliedMigration(AppliedMigration appliedMigration) {
                                 + "," + dbSupport.quote("execution_time")
                                 + "," + dbSupport.quote("success")
                                 + ")"
-                                + " VALUES (?, ?, ?, ?, ?, ?, " + installedBy + ", ?, ?)",
+                                + " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
                         installedRank,
                         versionStr,
                         appliedMigration.getDescription(),
                         appliedMigration.getType().name(),
                         appliedMigration.getScript(),
                         appliedMigration.getChecksum(),
+                        installedBy,
                         appliedMigration.getExecutionTime(),
                         appliedMigration.isSuccess()
                 );