Might fix signup weirdness?