Personalization

@Berdir asked specifically to review this branch, please leave the merging to him.
Was confused why this works for a moment, but you're creating the hash yourself.. I guess that's fine.