Feature/now 244

We might consider moving this into the authentication-manager.