trying to clean up client signup. probably making it worse