Fix for Issue #24: "Stops working when switching between users"