diff --git a/network_messages.cddl b/network_messages.cddl
index c175e21..de83bc3 100644
--- a/network_messages.cddl
+++ b/network_messages.cddl
@@ -10,9 +10,9 @@ psk-input-method = &(
   qr-code: 1
 )
 
-auth-initiation-token = (
+auth-initiation-token = {
   ? 0: text ; token
-)
+}
 
 auth-spake2-psk-status = &(
   psk-needs-presentation: 0
@@ -41,7 +41,9 @@ auth-status = {
 
 ; type key 1005
 auth-spake2-handshake = {
-  0: auth-spake2-psk-status ; psk-status
-  1: bytes ; public-value
+  0: auth-initiation-token; initiation-token
+  1: auth-spake2-psk-status ; psk-status
+  2: bytes ; public-value
 }
 
+