Shadowhunter activation/deactivation of Demonform

I don’t know if Demonhunters will need x-button for anything later, but for now it’s just the z-button too get in and out of demon form. In stressfull sitiations or with lag, it’s quite easy to activate and de-activate your form by accident. Is it possible to bind the deactivation to x instead as too reduce risk?