Moved the places of signup form fields

Previous order caused honey pot errors