--- a/flag/includes/flag/flag_flag.inc	Mon Apr 22 13:30:02 2013
+++ b/flag/includes/flag/flag_flag.inc	Mon Apr 22 13:29:25 2013
@@ -116,6 +116,9 @@
     // Populate the options with the defaults.
     $options = (array) unserialize($row->options);
     $flag_options = $flag->options();
+    if (!empty($flag_options)) {
+      $options += $flag_options;
+    }
 
     // Make the unserialized options accessible as normal properties.
     foreach ($options as $option => $value) {
