Fixed #22 and some social_signup form issues