diff --git a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp
index bf68b0dd8..2a6281d49 100644
--- a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp
+++ b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp
@@ -117,7 +117,7 @@ int CardReaderPlugin::findRunId(int si_id, int si_finish_time, QString *err_msg)
 		q.exec("SELECT id, leg, startTimeMs, finishTimeMs FROM runs WHERE siId=" QF_IARG(si_id)
 			" AND isRunning"
 			" ORDER BY leg DESC"
-, qf::core::Exception::Throw);
+			, qf::core::Exception::Throw);
 	}
 	else {
 		int stage_no = currentStageId();
diff --git a/quickevent/app/quickevent/plugins/Event/src/dbschema.cpp b/quickevent/app/quickevent/plugins/Event/src/dbschema.cpp
index 218410d1a..e65c3a4f8 100644
--- a/quickevent/app/quickevent/plugins/Event/src/dbschema.cpp
+++ b/quickevent/app/quickevent/plugins/Event/src/dbschema.cpp
@@ -79,6 +79,7 @@ QStringList DbSchema::loadCreateDbSqlScript(const CreateDbSqlScriptOptions &crea
 	}
 	auto sql = QString::fromUtf8(f.readAll());
 	QVariantMap replacements;
+	replacements["eventId"] = create_options.schemaName();
 	replacements["minDbVersion"] = Event::EventPlugin::dbVersion();
 	sql = qf::core::Utils::replaceCaptions(sql, replacements);
 	auto lines = sql.split(";\n");
diff --git a/quickevent/app/quickevent/src/appversion.h b/quickevent/app/quickevent/src/appversion.h
index 90a8c6f0a..30fc0dd81 100644
--- a/quickevent/app/quickevent/src/appversion.h
+++ b/quickevent/app/quickevent/src/appversion.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#define APP_VERSION "3.5.3"
+#define APP_VERSION "3.5.4"