Fix with current user