Index: uc_store.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/Attic/uc_store.admin.inc,v
retrieving revision 1.1.2.17
diff -u -p -r1.1.2.17 uc_store.admin.inc
--- uc_store.admin.inc	23 Sep 2009 15:45:55 -0000	1.1.2.17
+++ uc_store.admin.inc	1 Oct 2009 22:42:08 -0000
@@ -602,7 +602,7 @@ function uc_store_store_settings_form() 
     '#size' => 32,
     '#maxlength' => 128,
     '#required' => FALSE,
-    '#default_value' => variable_get('uc_store_email', NULL),
+    '#default_value' => variable_get('uc_store_email', variable_get('site_mail', NULL)),
     '#summary' => variable_get('uc_store_email', NULL) ? t('Store e-mail address is %email.', array('%email' => variable_get('uc_store_email', ''))) : t('Store e-mail address is not set.'),
   );
 
@@ -1266,4 +1266,3 @@ function uc_price_settings_form_submit($
 
   drupal_set_message(t('Price handler configuration saved.'));
 }
-