diff --git a/code/modules/modular_computers/file_system/programs/system/client_manager.dm b/code/modules/modular_computers/file_system/programs/system/client_manager.dm
index 0b84b640a93..4f26f8050fe 100644
--- a/code/modules/modular_computers/file_system/programs/system/client_manager.dm
+++ b/code/modules/modular_computers/file_system/programs/system/client_manager.dm
@@ -68,9 +68,9 @@
 	if(!computer)
 		return FALSE
 	computer.enrolled = 2 // private devices
-	computer.hard_drive.store_file(new /datum/computer_file/program/filemanager())
-	computer.hard_drive.store_file(new /datum/computer_file/program/ntnetdownload())
-	computer.hard_drive.store_file(new /datum/computer_file/program/chatclient())
+	computer.hard_drive.store_file(new /datum/computer_file/program/filemanager(computer))
+	computer.hard_drive.store_file(new /datum/computer_file/program/ntnetdownload(computer))
+	computer.hard_drive.store_file(new /datum/computer_file/program/chatclient(computer))
 	return TRUE
 
 //Set´s up the programs from the preset
@@ -80,7 +80,7 @@
 
 	for (var/datum/modular_computer_app_presets/prs in ntnet_global.available_software_presets)
 		if(prs.name == preset && prs.available == 1)
-			var/list/prs_programs = prs.return_install_programs()
+			var/list/prs_programs = prs.return_install_programs(computer)
 			for (var/datum/computer_file/program/prog in prs_programs)
 				if(!prog.is_supported_by_hardware(computer.hardware_flag, FALSE))
 					continue
diff --git a/html/changelogs/johnwildkins-compfix.yml b/html/changelogs/johnwildkins-compfix.yml
new file mode 100644
index 00000000000..ad0d762708b
--- /dev/null
+++ b/html/changelogs/johnwildkins-compfix.yml
@@ -0,0 +1,6 @@
+author: JohnWildkins
+
+delete-after: True
+
+changes:
+  - bugfix: "Modular computer programs should now properly be assigned their parent computer on creation."