Fixed regression by imposing order dependency on database updates
Add passkey