Hi Remco, we have good news. It's still work in progress but 2-Way authentication is almost finnished. We suspect it to be released in January 2016. You can then enable it by activating Oauth2 within Workspace 365. By that time we will also write a document on how to setup 2-way authentication. Thanks for your request, this helps us to improve the workspace!