Further additions and cleanup to signup and login.