Changed some mapping and fixed the facebook logout