diff --git a/fillpdf.admin.inc b/fillpdf.admin.inc
index 1affaba..b68e555 100644
--- a/fillpdf.admin.inc
+++ b/fillpdf.admin.inc
@@ -649,7 +649,7 @@ function fillpdf_field_edit_submit($form, &$form_state) {
     //add a new field
     $edit_field = (object)$form_state['values'];
     db_query("INSERT INTO {fillpdf_fields} (fid, label, pdf_key, value, replacements) VALUES(%d, '%s', '%s', '%s', '%s')",
-      $form['#pdf_form']->fid, $form_state['values']['label'], $form_state['values']['pdf_key'], $form_state['values']['value'], $form_state['values']['replacements']);
+      $form['#pdf_form']->fid, $form_state['values']['label'], $form_state['values']['pdf_key'], empty($form_state['values']['value']) ? '' : $form_state['values']['value'], $form_state['values']['replacements']);
   }
   $form_state['redirect'] = 'admin/content/fillpdf/'. $form['#pdf_form']->fid;
 }
@@ -690,6 +690,6 @@ function fillpdf_field_delete_confirm_submit($form, &$form_state) {
 function fillpdf_update_field(&$pdf_form, &$field, $old_key) {
   db_query("UPDATE {fillpdf_fields} SET label = '%s', pdf_key='%s',
            value = '%s', replacements='%s' WHERE fid = %d AND pdf_key = '%s'",
-           $field->label, $field->pdf_key, $field->value, $field->replacements,
+           $field->label, $field->pdf_key, empty($field->value) ? '' : $field->value, $field->replacements,
            $pdf_form->fid, $old_key);
 }