diff --git a/source/save_util.c b/source/save_util.c
index 0d62ffc..770d336 100644
--- a/source/save_util.c
+++ b/source/save_util.c
@@ -380,7 +380,7 @@ int create_savegame_folder(const char* folder)
 
 static void _log_settings(app_config_t* config)
 {
-	LOG("Apollo Save Tool v%s - Patch Engine v%s", APOLLO_VERSION, APOLLO_LIB_VERSION);
+    LOG("Apollo Save Tool v%s - Patch Engine v%s", APOLLO_VERSION, APOLLO_LIB_VERSION);
     LOG("User Settings: UserID (%08d) AccountID (%016lX)", config->user_id, config->account_id);
     LOG("PSID %016lX %016lX", config->psid[0], config->psid[1]);
     LOG("IDPS %016lX %016lX", config->idps[0], config->idps[1]);
diff --git a/source/saves.c b/source/saves.c
index a00d7ad..1fab37b 100644
--- a/source/saves.c
+++ b/source/saves.c
@@ -705,7 +705,7 @@ int ReadOnlineSaves(save_entry_t * game)
 	char path[256];
 	snprintf(path, sizeof(path), APOLLO_LOCAL_CACHE "%s.txt", game->title_id);
 
-	if (file_exists(path) == SUCCESS)
+	if (file_exists(path) == SUCCESS && strcmp(apollo_config.save_db, ONLINE_URL) == 0)
 	{
 		struct stat stats;
 		stat(path, &stats);
@@ -1589,7 +1589,7 @@ static void _ReadOnlineListEx(const char* urlPath, uint16_t flag, list_t *list)
 
 	snprintf(path, sizeof(path), APOLLO_LOCAL_CACHE "%04X_games.txt", flag);
 
-	if (file_exists(path) == SUCCESS)
+	if (file_exists(path) == SUCCESS && strcmp(apollo_config.save_db, ONLINE_URL) == 0)
 	{
 		struct stat stats;
 		stat(path, &stats);
diff --git a/source/settings.c b/source/settings.c
index 2cd319a..4fcd993 100644
--- a/source/settings.c
+++ b/source/settings.c
@@ -104,6 +104,9 @@ static void db_url_callback(int sel)
 {
 	if (osk_dialog_get_text("Enter the URL of the online database", apollo_config.save_db, sizeof(apollo_config.save_db)))
 		show_message("Online database URL changed to:\n%s", apollo_config.save_db);
+	
+	if (apollo_config.save_db[strlen(apollo_config.save_db)-1] != '/')
+		strcat(apollo_config.save_db, "/");
 }
 
 static void clearcache_callback(int sel)