fixed signin/signup conflict