diff --git a/tbsetup/ptopgen.in b/tbsetup/ptopgen.in
index 3f24b618eb20ea9e360364f197275a33f0c643d9..c0a7cc07ad5b1543332a4bdfab4cf1aaecbe67d8 100644
--- a/tbsetup/ptopgen.in
+++ b/tbsetup/ptopgen.in
@@ -137,6 +137,9 @@ $opstate = <<'OPSTATE';
     <action name="geni_stop" next="geni_stopping">
       <description>Power down or stop the node.</description>
     </action>
+    <action name="geni_update_users" next="geni_updating_users">
+      <description>Update user SSH keys.</description>
+    </action>
     <description>The node is up and ready to use.</description>
   </state>
   <state name="geni_stopping">
@@ -149,6 +152,14 @@ $opstate = <<'OPSTATE';
     intervention before it can be used. Please contact
     the administrator for assistance.</description>
   </state>
+  <state name="geni_updating_users">
+    <action name="geni_update_users_cancel" next="geni_ready">
+      <description>Cancel an update users action</description>
+    </action>
+    <wait type="geni_success" next="geni_ready" />
+    <description>Updating users can take a fair amount of time, so it
+    happens asynchronously in this state.</description>
+  </state>
 </rspec_opstate>
 OPSTATE