diff --git a/sites/all/modules/remember_values/remember_values.module b/sites/all/modules/remember_values/remember_values.module
index acabafc..8714d1b 100644
--- a/sites/all/modules/remember_values/remember_values.module
+++ b/sites/all/modules/remember_values/remember_values.module
@@ -16,6 +16,9 @@ define('REMEMBER_VALUES_VALID_WIDGETS', serialize(array(
   'link_field',
   'email_textfield',
   'entityreference_autocomplete',
+  'select_or_other',
+  'select_or_other_buttons',
+  'addressfield_standard',
 )));
 
 /**
@@ -148,6 +151,8 @@ function remember_values_write_value(&$form, $field_name, $values, $field_data)
 
       case 'options_buttons':
       case 'options_select':
+      case 'select_or_other':
+      case 'select_or_other_buttons':
         $field_info = field_info_field($field_name);
         if ($field_info['cardinality'] == 1) {
           $value = array_values($values['0']);
@@ -161,6 +166,13 @@ function remember_values_write_value(&$form, $field_name, $values, $field_data)
         }
         break;
 
+      case 'addressfield_standard':
+        $field_info = field_info_field($field_name);
+        foreach ($values as $key => $value) {
+          $form[$field_name]['und'][$key]['#address'] = $value;
+        }
+        break;
+
       case 'options_onoff':
         $form[$field_name]['und']['#default_value'] = $values[0]['value'];
         break;