diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 0d3fdaa1a6..3c7e5dc6b4 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -54,7 +54,7 @@
 		feedback_set_details("game_mode","[ticker.mode]")
 	if(revdata)
 		feedback_set_details("revision","[revdata.revision]")
-	feedback_set_details("server_ip","[world.address]")
+	feedback_set_details("server_ip","[world.internet_address]")
 	return 1
 
 
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index f9d992b548..cc99d9aad1 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -163,8 +163,15 @@ var/obj/machinery/blackbox_recorder/blackbox
 	proc/save_all_data_to_sql()
 		if(!feedback) return
 
+		var/user = sqlfdbklogin
+		var/pass = sqlfdbkpass
+		var/db = sqlfdbkdb
+		var/address = sqladdress
+		var/port = sqlport
+
 		var/DBConnection/dbcon = new()
-		dbcon.Connect("dbi:mysql:test:fornoreason.servehttp.com:3306","erro","3rr0HatesGlov3s")
+
+		dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
 		if(!dbcon.IsConnected()) return
 		var/round_id