diff --git a/scripts/_00e_autosavesystem_functions.pex b/scripts/_00e_autosavesystem_functions.pex
index 75d23664..6a645788 100644
Binary files a/scripts/_00e_autosavesystem_functions.pex and b/scripts/_00e_autosavesystem_functions.pex differ
diff --git a/source/Enderal DLL/src/PapyrusFunctions.h b/source/Enderal DLL/src/PapyrusFunctions.h
index 36af5e60..b685bc9a 100644
--- a/source/Enderal DLL/src/PapyrusFunctions.h	
+++ b/source/Enderal DLL/src/PapyrusFunctions.h	
@@ -89,12 +89,16 @@ namespace Papyrus::PapyrusFunctions
 		sstream << StringToHex(RE::PlayerCharacter::GetSingleton()->GetName()).c_str();
 		sstream << "_";
 
+		// TODO: Add cell names and delete old copies, current implementation breaks rotation
+		/*
 		RE::TESObjectCELL* parentCell = RE::PlayerCharacter::GetSingleton()->parentCell;
 		if (parentCell->IsInteriorCell()) {
 			sstream << parentCell->GetFormEditorID();
 		} else {
 			sstream << RE::PlayerCharacter::GetSingleton()->GetWorldspace()->GetFormEditorID();
 		}
+		*/
+		sstream << "Vyn";
 
 		sstream << "_000000_00000000000000_1_1";
 
diff --git a/source/scripts/_00e_autosavesystem_functions.psc b/source/scripts/_00e_autosavesystem_functions.psc
index f0c7ab86..586e4271 100644
--- a/source/scripts/_00e_autosavesystem_functions.psc
+++ b/source/scripts/_00e_autosavesystem_functions.psc
@@ -4,11 +4,11 @@ Event OnUpdate()
 	
 	Actor PlayerREF = Game.GetForm(0x14) as Actor
 	
-	if PlayerREF.IsDead() || ! PlayerREF.GetParentCell()
+	if PlayerREF.IsDead()
 		return
 	endif
 	
-	If PlayerREF.IsInCombat() || PlayerREF.IsOnMount() || PlayerREF.IsSwimming() || ! Game.IsFightingControlsEnabled() || Utility.IsInMenuMode() || UI.IsTextInputEnabled() || UI.IsMenuOpen("Dialogue Menu")
+	If PlayerREF.IsInCombat() || PlayerREF.IsOnMount() || PlayerREF.IsSwimming() || ! Game.IsFightingControlsEnabled() || Utility.IsInMenuMode() || UI.IsTextInputEnabled() || UI.IsMenuOpen("Dialogue Menu") || ! PlayerREF.GetParentCell()
 		RegisterForSingleUpdate(5)
 		return
 	endif