Keybindings on different computers

I have two computers that I play on that utilize different sets of keybindings. One uses an MMO mouse with keybindings to mouse buttons and the other relies on keyboard button keybindings. Since a recent update, I have found that in game only one set of keybinds are allowed and both my computers have to use them or I need to change every time.

Has anyone ran into this or have a solution?

Thanks!