diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
index 6abd7974794f..d6f5e1242fec 100644
--- a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
+++ b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
@@ -372,24 +372,10 @@
                 carryover_percentage=40
             [/gold_carryover]
         [/objectives]
-        [move_unit_fake]
-            type=Gryphon Rider
-            side=1
-            x=1,5
-            y=16,28
-        [/move_unit_fake]
-        [unit]
-            id=Kawn # wmllint: ignore
-            name= _ "Kawn"
-            type=Gryphon Rider
-            x,y=5,28
-            side=1
-            random_traits=yes
-        [/unit]
-        [allow_recruit]
-            side=1
-            type=Gryphon Rider
-        [/allow_recruit]
+
+        [redraw]
+            clear_shroud=yes
+        [/redraw]
     [/event]
 
     [event]
@@ -444,7 +430,7 @@
         [filter]
             x,y=$thur_x,$thur_y
             side=1
-            type=Gryphon Rider,Gryphon
+            type=Gryphon
         [/filter]
 
         [if]
@@ -479,7 +465,7 @@
             x,y=$thur_x,$thur_y
             side=1
             [not]
-                type=Gryphon Rider,Gryphon
+                type=Gryphon
             [/not]
         [/filter]
 
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
index 9c3e048a6bce..14f3fb0ec695 100644
--- a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
+++ b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
@@ -353,6 +353,14 @@
             speaker=Durstorn
             message= _ "Shut up, all of you! Attack them!"
         [/message]
+
+        #TODO: Tell the player about this. While Thursagan was trying to
+        #forge the sceptre, the dwarvesh tamed the gryphons and learnt
+        #to ride them.
+        [allow_recruit]
+            side=1
+            type=Gryphon Rider
+        [/allow_recruit]
     [/event]
 
     [event]