WhiteFire Sondergaard in-world; keyholder

WhiteFire: "Fixed the refactoring in UserCommand() so it actually works
with buttons from foreign menus."