diff --git a/scripts/_00e_game_talentcontrolsc.pex b/scripts/_00e_game_talentcontrolsc.pex
index 9fffbf71..35ef56a3 100644
Binary files a/scripts/_00e_game_talentcontrolsc.pex and b/scripts/_00e_game_talentcontrolsc.pex differ
diff --git a/scripts/_00e_mqp01_functions.pex b/scripts/_00e_mqp01_functions.pex
index 6ddd01f3..7f2048a8 100644
Binary files a/scripts/_00e_mqp01_functions.pex and b/scripts/_00e_mqp01_functions.pex differ
diff --git a/scripts/_00e_playersetupscript.pex b/scripts/_00e_playersetupscript.pex
index 3df70b7f..d472e06e 100644
Binary files a/scripts/_00e_playersetupscript.pex and b/scripts/_00e_playersetupscript.pex differ
diff --git a/source/scripts/_00e_game_talentcontrolsc.psc b/source/scripts/_00e_game_talentcontrolsc.psc
index e26434bc..c545c5b7 100644
--- a/source/scripts/_00e_game_talentcontrolsc.psc
+++ b/source/scripts/_00e_game_talentcontrolsc.psc
@@ -64,25 +64,6 @@ Event OnPlayerLoadGame()
 		EndIf
 
 		RegisterForActions()
-
-		Bool bFS = (Game.GetModByName("Enderal - Forgotten Stories.esm") != 255)
-		Bool bSkyUI = (Game.GetModByName("SkyUI_SE.esp") != 255)
-		If bFS == False && bSkyUI == False
-			Debug.MessageBox("Enderal - Forgotten Stories.esm and SkyUI_SE.esp are not loaded! Open Data Files and enable them. If the game was started without them, you should start a new game.")
-			Game.QuitToMainMenu()
-			Return
-		ElseIf bFS == False
-			Debug.MessageBox("Enderal - Forgotten Stories.esm is not loaded! Open Data Files and enable it. If the game was started without it, you should start a new game.")
-			Game.QuitToMainMenu()
-			Return
-		ElseIf bSkyUI == False
-			Debug.MessageBox("SkyUI_SE.esp is not loaded! Open Data Files and enable it.")
-		EndIf
-
-		; SE: Workaround for broken physics in saves, made on a mount
-		If PlayerREF.IsOnMount()
-			PlayerREF.Dismount()
-		EndIf
 	EndIf
 EndEvent
 
diff --git a/source/scripts/_00e_mqp01_functions.psc b/source/scripts/_00e_mqp01_functions.psc
index 86c31075..c043104f 100644
--- a/source/scripts/_00e_mqp01_functions.psc
+++ b/source/scripts/_00e_mqp01_functions.psc
@@ -23,23 +23,6 @@ Function SetUpScene()
 	Wait(5.0)
 	Game.EnablePlayerControls()
 	Game.DisablePlayerControls(false, true, true, false, true, false, false)
-
-	Bool bFS = (Game.GetModByName("Enderal - Forgotten Stories.esm") != 255)
-	Bool bSkyUI = (Game.GetModByName("SkyUI_SE.esp") != 255)
-	If bFS == False && bSkyUI == False
-		Debug.MessageBox("Enderal - Forgotten Stories.esm and SkyUI_SE.esp are not loaded! The game will not run properly. Open Data Files and enable them.")
-		Game.QuitToMainMenu()
-		Return
-	ElseIf bFS == False
-		Debug.MessageBox("Enderal - Forgotten Stories.esm is not loaded! The game will not run properly. Open Data Files and enable it.")
-		Game.QuitToMainMenu()
-		Return
-	ElseIf bSkyUI == False
-		Debug.MessageBox("SkyUI_SE.esp is not loaded! The game will not run properly. Open Data Files and enable it.")
-		Game.QuitToMainMenu()
-		Return
-	EndIf
-
 	Wait(1.0)
 	_00E_MQP01_Thoughts01.ShowAsHelpMessage("Empty", 5, 1, 1)
 
diff --git a/source/scripts/_00e_playersetupscript.psc b/source/scripts/_00e_playersetupscript.psc
index f035282f..73a3cc69 100644
--- a/source/scripts/_00e_playersetupscript.psc
+++ b/source/scripts/_00e_playersetupscript.psc
@@ -65,20 +65,45 @@ Function CheckIfForgottenStoriesIsLoaded()
 	
 	; function that quits back to the main menu when the Enderal - Forgotten Stories.esm is not not being added to the plugins.txt
 	; and hence not being loaded in-game. Unknown reason, probably write protection issues	
-	
-	If Game.GetModByName("Enderal - Forgotten Stories.esm") == 255
-		bFSWasNotLoadedBefore = true
-		_00E_Game_ForgottenStoriesNotLoaded.Show()
+
+	if (Game.GetFormFromFile(0x0004320E, "Skyrim.esm") as GlobalVariable).GetValueInt() != 1
+		Utility.wait(2.0)
 		Game.QuitToMainMenu()
-	Else
-		If bFSWasNotLoadedBefore == true
-			AddPerks()
-			If FSQuestsToStartFailsafePatch1560 == None
-				FSQuestsToStartFailsafePatch1560 = Game.GetFormFromFile(0x0102F4B0, "Enderal - Forgotten Stories.esm") as FormList
-			EndIf
-			StartQuests(FSQuestsToStartFailsafePatch1560)
-			bFSWasNotLoadedBefore = false
-		EndIf
+		Debug.MessageBox("Enderal - Forgotten Stories.esm is not loaded! The game will not run properly. Open Data Files and enable it.")
+	EndIf
+
+	if Debug.GetPlatformName() != "Win64"
+		return
+	endif
+
+	Int SKSEVer = SKSE.GetVersion()
+
+	if SKSEVer == 0
+		Utility.wait(2.0)
+		Game.QuitToMainMenu()
+		Debug.MessageBox("SKSE is not detected! Start Enderal through the launcher or skse64_loader.exe in the game directory.")
+		Return
+	endif
+
+	Quest bSkyUI = Game.GetFormFromFile(0x00000802, "SkyUI_SE.esp") as Quest
+
+	If bSkyUI == None
+		Utility.wait(2.0)
+		Game.QuitToMainMenu()
+		Debug.MessageBox("SkyUI_SE.esp is not loaded! The game will not run properly. Open Data Files and enable it.")
+		Return
+	EndIf
+
+	if SKSE.GetPluginVersion("fs_skse_functions") == -1
+		Utility.wait(2.0)
+		Game.QuitToMainMenu()
+		Debug.MessageBox("fs.dll is not loaded! The game will not run properly. Verify integrity of your files.\n\nThis may also happen, if your version of SKSE or Enderal is too old. In this case, it is advised to upgrade.")
+		Return
+	endif
+
+	; fixes properties that were accidentally set to NONE by the "More Affinities" mod
+	If Game.GetModByName("Enderal_FS_More_Affinities.esp") != 255
+		FixMoreAffinitiesMod()
 	EndIf
 
 EndFunction
@@ -403,10 +428,10 @@ Function Maintenance()
 	FailsafeMQ05PrologueAliases()
 	
 	RefreshMountNamesOnLoad()
-	
-	; fixes properties that were accidentally set to NONE by the "More Affinities" mod
-	If Game.GetModByName("Enderal_FS_More_Affinities.esp") != 255
-		FixMoreAffinitiesMod()
+
+	; Workaround for broken physics on loading saves, made on a mount
+	If PlayerREF.IsOnMount()
+		PlayerREF.Dismount()
 	EndIf
 
 EndFunction