Ensure that KC remembers the role you last used for a particular account

[punmechanic]

I didn't dismiss any reviews, I just mistakenly pushed a new commit to my main branch before this one was merged. I'm merging this as we already did a review of this PR and it has not changed