Add support for /register and /unregister