Fix issue with multiple signed-in users...