Agile Keychain optimizations (thanks atom!)

We already do this in O5LOGON but we should
find more places where we can use this ;)