Mark/fix signup form

@chenhoward