Fix the check if the default bucket is set when the user data is being composed