Changes from vendor/plugins:

Nick: taking signup forward
Tom: Fix deprecated constant.