Final commit before redesign of login through facebook/twitter