Update signin form setup to be even more stramlined