fix signup
fix js conflict