diff --git a/IceHUD.lua b/IceHUD.lua
index 1fc9d89..7b136dc 100644
--- a/IceHUD.lua
+++ b/IceHUD.lua
@@ -251,11 +251,12 @@ function IceHUD:OnEnable(isFirst)
 		if LibDualSpec then
 			LibDualSpec:EnhanceDatabase(self.db, "IceHUD")
 		end
-		--@debug@
-		IceHUD_Options:OnLoad()
-		--@end-debug@
 	end
 
+	--@debug@
+	IceHUD_Options:OnLoad()
+	--@end-debug@
+
 	if isFirst then
 		self:SetDebugging(self.IceCore:GetDebug())
 		self.debugFrame = ChatFrame2
diff --git a/IceHUD_Options/Options.lua b/IceHUD_Options/Options.lua
index f4feddc..43971b9 100644
--- a/IceHUD_Options/Options.lua
+++ b/IceHUD_Options/Options.lua
@@ -653,7 +653,7 @@ function IceHUD_Options:OnLoad()
 	self.options.args.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(IceHUD.db)
 
 	-- Add dual-spec support
-	if LibDualSpec then
+	if IceHUD.db.profile.enable and LibDualSpec then
 		LibDualSpec:EnhanceOptions(IceHUD_Options.options.args.profiles, IceHUD.db)
 	end