Fix for multiple users