Basic sign-up client functionality
Fixed merge conflict