improved the signup support.