Start cleaning up social callback
Fixed flow of redirects