diff --git a/src/main/java/org/qortal/api/resource/AdminResource.java b/src/main/java/org/qortal/api/resource/AdminResource.java
index bfcd54ca..39deabee 100644
--- a/src/main/java/org/qortal/api/resource/AdminResource.java
+++ b/src/main/java/org/qortal/api/resource/AdminResource.java
@@ -668,7 +668,7 @@ public class AdminResource {
 			blockchainLock.lockInterruptibly();
 
 			try {
-				repository.backup(true);
+				repository.backup(true, "backup");
 				repository.saveChanges();
 
 				return "true";
diff --git a/src/main/java/org/qortal/controller/AutoUpdate.java b/src/main/java/org/qortal/controller/AutoUpdate.java
index 6c1dd928..6d74e0e8 100644
--- a/src/main/java/org/qortal/controller/AutoUpdate.java
+++ b/src/main/java/org/qortal/controller/AutoUpdate.java
@@ -216,7 +216,7 @@ public class AutoUpdate extends Thread {
 
 		// Give repository a chance to backup in case things go badly wrong (if enabled)
 		if (Settings.getInstance().getRepositoryBackupInterval() > 0)
-			RepositoryManager.backup(true);
+			RepositoryManager.backup(true, "backup");
 
 		// Call ApplyUpdate to end this process (unlocking current JAR so it can be replaced)
 		String javaHome = System.getProperty("java.home");
diff --git a/src/main/java/org/qortal/controller/Controller.java b/src/main/java/org/qortal/controller/Controller.java
index fad244f4..a00ffdac 100644
--- a/src/main/java/org/qortal/controller/Controller.java
+++ b/src/main/java/org/qortal/controller/Controller.java
@@ -573,7 +573,7 @@ public class Controller extends Thread {
 								Translator.INSTANCE.translate("SysTray", "CREATING_BACKUP_OF_DB_FILES"),
 								MessageType.INFO);
 
-					RepositoryManager.backup(true);
+					RepositoryManager.backup(true, "backup");
 				}
 
 				// Prune stuck/slow/old peers
diff --git a/src/main/java/org/qortal/repository/hsqldb/HSQLDBRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBRepository.java
index c1f8a2d5..8c69e0f2 100644
--- a/src/main/java/org/qortal/repository/hsqldb/HSQLDBRepository.java
+++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBRepository.java
@@ -379,7 +379,7 @@ public class HSQLDBRepository implements Repository {
 	}
 
 	@Override
-	public void backup(boolean quick) throws DataException {
+	public void backup(boolean quick, String name) throws DataException {
 		if (!quick)
 			// First perform a CHECKPOINT
 			try (Statement stmt = this.connection.createStatement()) {
@@ -401,7 +401,7 @@ public class HSQLDBRepository implements Repository {
 				return;
 			}
 
-			String backupUrl = buildBackupUrl(dbPathname);
+			String backupUrl = buildBackupUrl(dbPathname, name);
 			String backupPathname = getDbPathname(backupUrl);
 			if (backupPathname == null)
 				throw new DataException("Unable to determine location for repository backup?");
@@ -423,7 +423,7 @@ public class HSQLDBRepository implements Repository {
 
 		// Actually create backup
 		try (Statement stmt = this.connection.createStatement()) {
-			stmt.execute("BACKUP DATABASE TO 'backup/' BLOCKING AS FILES");
+			stmt.execute(String.format("BACKUP DATABASE TO '%s/' BLOCKING AS FILES", name));
 		} catch (SQLException e) {
 			throw new DataException("Unable to backup repository");
 		}
@@ -472,22 +472,22 @@ public class HSQLDBRepository implements Repository {
 			return matcher.group(2);
 	}
 
-	private static String buildBackupUrl(String dbPathname) {
+	private static String buildBackupUrl(String dbPathname, String backupName) {
 		Path oldRepoPath = Paths.get(dbPathname);
 		Path oldRepoDirPath = oldRepoPath.getParent();
 		Path oldRepoFilePath = oldRepoPath.getFileName();
 
 		// Try to open backup. We need to remove "create=true" and insert "backup" dir before final filename.
-		String backupUrlTemplate = "jdbc:hsqldb:file:%s%sbackup%s%s;create=false;hsqldb.full_log_replay=true";
-		return String.format(backupUrlTemplate, oldRepoDirPath.toString(), File.separator, File.separator, oldRepoFilePath.toString());
+		String backupUrlTemplate = "jdbc:hsqldb:file:%s%s%s%s%s;create=false;hsqldb.full_log_replay=true";
+		return String.format(backupUrlTemplate, oldRepoDirPath.toString(), File.separator, backupName, File.separator, oldRepoFilePath.toString());
 	}
 
-	/* package */ static void attemptRecovery(String connectionUrl) throws DataException {
+	/* package */ static void attemptRecovery(String connectionUrl, String name) throws DataException {
 		String dbPathname = getDbPathname(connectionUrl);
 		if (dbPathname == null)
 			throw new DataException("Unable to locate repository for backup?");
 
-		String backupUrl = buildBackupUrl(dbPathname);
+		String backupUrl = buildBackupUrl(dbPathname, name);
 		Path oldRepoDirPath = Paths.get(dbPathname).getParent();
 
 		// Attempt connection to backup to see if it is viable
diff --git a/src/main/java/org/qortal/repository/hsqldb/HSQLDBRepositoryFactory.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBRepositoryFactory.java
index be9c09eb..64f6be8c 100644
--- a/src/main/java/org/qortal/repository/hsqldb/HSQLDBRepositoryFactory.java
+++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBRepositoryFactory.java
@@ -54,7 +54,7 @@ public class HSQLDBRepositoryFactory implements RepositoryFactory {
 				throw new DataException("Unable to read repository: " + e.getMessage(), e);
 
 			// Attempt recovery?
-			HSQLDBRepository.attemptRecovery(connectionUrl);
+			HSQLDBRepository.attemptRecovery(connectionUrl, "backup");
 		}
 
 		this.connectionPool = new HSQLDBPool(Settings.getInstance().getRepositoryConnectionPoolSize());