More updates to user sign-up process -- finally improving free-trial code...