Fixed handling of empty user options