Fixed a few bugs after merging signin