Fix for global users