Fixes #5486 Keep authorized key options in tact and ordered