Further changes for initial passport authentication - WIP