diff --git a/scripts/liteprofilesutils/liteprofilesutils_world.dsc b/scripts/liteprofilesutils/liteprofilesutils_world.dsc
index eb060b5..ae2b003 100644
--- a/scripts/liteprofilesutils/liteprofilesutils_world.dsc
+++ b/scripts/liteprofilesutils/liteprofilesutils_world.dsc
@@ -99,3 +99,11 @@ liteprofilesutils_world:
         - else if <[data].get[type]> == free:
             - execute as_player "profile add"
             - run liteprofilesutils_show_menu def.player:<player>
+        ## patch whitelisting
+        on player prelogin:
+        - define uuid <context.uuid>
+        - define master <proc[liteprofilesutils_get_master_uuid].context[<player[<[uuid]>]>]>
+        - if <[master]> == <[uuid]>:
+            - stop
+        - adjust <player[<[uuid]>]> whitelisted:<player[<[master]>].is_whitelisted>
+
diff --git a/scripts/storyboard/intro/intro_interactions.dsc b/scripts/storyboard/intro/intro_interactions.dsc
index e6c8174..3712a11 100644
--- a/scripts/storyboard/intro/intro_interactions.dsc
+++ b/scripts/storyboard/intro/intro_interactions.dsc
@@ -69,6 +69,7 @@ intro_interact_laptop_task:
     - ~run textbox_write def.player:<player>  def.queue:<queue> "def.line3s:You should give your character$$nla cool name, right?"
     - waituntil <player.has_flag[textbox_state].not> max:5s
     - ~run textbox_flush def.player:<player>
+    - run storyboard_player_end_atomic_sequence def.queue:<queue> def.player:<player>
     - run anvil_input def.player:<player> "def.prompt:Character Name" def.callback:intro_interact_laptop_task_name_callback
 
 intro_interact_laptop_task_name_callback:
@@ -76,6 +77,7 @@ intro_interact_laptop_task_name_callback:
     type: task
     definitions: player|input
     script:
+    - run storyboard_player_begin_atomic_sequence def.queue:<queue> def.player:<player>
     - define __player <[player]>
     - define name <[input].substring[1,24]>
     - if <server.flag[character_rpnames].contains[<[name]>]>:
@@ -89,6 +91,7 @@ intro_interact_laptop_task_name_callback:
     - ~run textbox_write def.player:<player>  def.queue:<queue> "def.line3s:Let's give them a description.$$nlDescribe their physical attributes."
     - waituntil <player.has_flag[textbox_state].not> max:5s
     - ~run textbox_flush def.player:<player>
+    - run storyboard_player_end_atomic_sequence def.queue:<queue> def.player:<player>
     - run anvil_input def.player:<player> def.prompt:Description def.callback:intro_interact_laptop_task_description_callback
 
 intro_interact_laptop_task_description_callback:
@@ -96,6 +99,7 @@ intro_interact_laptop_task_description_callback:
     type: task
     definitions: player|input
     script:
+    - run storyboard_player_begin_atomic_sequence def.queue:<queue> def.player:<player>
     - define __player <[player]>
     - execute as_player player:<[player]> "setdesc <[input]>"
     - ~run textbox_write def.player:<player>  def.queue:<queue> "def.line3s:Great, your character's almost ready."
@@ -104,6 +108,7 @@ intro_interact_laptop_task_description_callback:
     - ~run textbox_write def.player:<player>  def.queue:<queue> "def.line3s:For complete beginners, we recommend$$nlstarting out as a student."
     - waituntil <player.has_flag[textbox_state].not> max:5s
     - ~run textbox_flush def.player:<player>
+    - run storyboard_player_end_atomic_sequence def.queue:<queue> def.player:<player>
     - run intro_interact_laptop_task_role_menu def.player:<player>
 
 intro_interact_laptop_task_role_menu:
@@ -133,6 +138,7 @@ intro_interact_laptop_task_role_callback:
     type: task
     definitions: player|input
     script:
+    - run storyboard_player_begin_atomic_sequence def.queue:<queue> def.player:<player>
     - inventory close player:<[player]>
     - define __player <[player]>
     - define adult <[input].to_lowercase.trim.equals[yes]>