keymanager: more backward compatible now

sorry, messed up previous version a bit...
But bonus: Now it also works nicely with account-service. :)