Ongoing fix for socialite flow

Issue #96