Fix signup and adjust database