Login work and signup merges