diff --git a/data/campaigns/Dead_Water/scenarios/02_Flight.cfg b/data/campaigns/Dead_Water/scenarios/02_Flight.cfg
index ed85ba666a74..7ac0b7160114 100644
--- a/data/campaigns/Dead_Water/scenarios/02_Flight.cfg
+++ b/data/campaigns/Dead_Water/scenarios/02_Flight.cfg
@@ -84,6 +84,16 @@
                 {ALTERNATIVE_OBJECTIVE_CAPTION}
                 description= _ "Defeat all enemy leaders"+{OBJECTIVE_FOOTNOTE _"(different bonus for each)"}
                 condition=win
+                [show_if]
+                    {VARIABLE_CONDITIONAL end_level_when_ring_picked_up boolean_equals no}
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Have a unit pick up the ring of power."
+                condition=win
+                [show_if]
+                    {VARIABLE_CONDITIONAL end_level_when_ring_picked_up boolean_equals yes}
+                [/show_if]
             [/objective]
 
             {HOW_TO_LOSE}
@@ -916,22 +926,6 @@ _f, _f, _f, _f, _f, _f, _f
                     name=end_level_when_ring_picked_up
                     value=yes
                 [/set_variable]
-
-                [objectives]
-                    side=1
-                    silent=yes
-                    [objective]
-                        description= _ "Have a unit pick up the ring of power."
-                        condition=win
-                    [/objective]
-
-                    {HOW_TO_LOSE}
-
-                    [gold_carryover]
-                        bonus=yes
-                        carryover_percentage=40
-                    [/gold_carryover]
-                [/objectives]
             [/then]
 
             # ...Otherwise, since the ring must have been picked up
diff --git a/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg b/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
index 9a0c01bf9cc1..53a88d04b0dc 100644
--- a/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
+++ b/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
@@ -194,6 +194,12 @@
             [objective]
                 description= _ "Death of Caladon"
                 condition=lose
+                [show_if]
+                    [have_unit]
+                        id=Caladon
+                        side=1
+                    [/have_unit]
+                [/show_if]
             [/objective]
 
             {TURNS_RUN_OUT}
@@ -661,18 +667,6 @@
             flag=post_teleport
         [/animate_unit]
 
-        # Remove the death of Caladon from a the loss conditions, but
-        # we probably don't need to make a point of it, so silent=yes.
-        [objectives]
-            silent=yes
-            side=1
-            [objective]
-                description= _ "Pry the flaming sword from the dead hand of its owner"
-                condition=win
-            [/objective]
-            {HOW_TO_LOSE}
-        [/objectives]
-
         [delay]
             time=700
             # Gives you time to see that Caladon teleported to the