diff -urp ../dp_installed_files/activitystream/activitystream.module sites/all/modules/activitystream/activitystream.module
--- ../dp_installed_files/activitystream/activitystream.module	2008-05-20 17:35:54.000000000 -0500
+++ sites/all/modules/activitystream/activitystream.module	2008-07-26 13:31:25.000000000 -0500
@@ -127,6 +127,7 @@ function activitystream_form_alter(&$for
 function activitystream_user($op, &$edit, &$account, $category = NULL) {
 	switch ($op) {
     case 'form':
+		$form = array();
 		if ($category == 'Activity Stream') {
 			foreach (module_implements('activitystream_settings') as $name) {
 				$function = $name .'_activitystream_settings';
diff -urp ../dp_installed_files/activitystream/activitystream_delicious/activitystream_delicious.module sites/all/modules/activitystream/activitystream_delicious/activitystream_delicious.module
--- ../dp_installed_files/activitystream/activitystream_delicious/activitystream_delicious.module	2008-05-20 17:35:54.000000000 -0500
+++ sites/all/modules/activitystream/activitystream_delicious/activitystream_delicious.module	2008-07-26 13:35:50.000000000 -0500
@@ -45,7 +45,7 @@ function activitystream_delicious_activi
   $form['activitystream_delicious']['activitystream_delicious_userid'] = array(
     '#type' => 'textfield',
     '#title' => t('Username'),
-    '#default_value' => $edit['activitystream_delicious_userid'],
+    '#default_value' => (isset($edit['activitystream_delicious_userid'])) ? $edit['activitystream_delicious_userid'] : '',
     '#description' => t('The username for your Del.icio.us account'));
   return $form;	
 }
diff -urp ../dp_installed_files/activitystream/activitystream_digg/activitystream_digg.module sites/all/modules/activitystream/activitystream_digg/activitystream_digg.module
--- ../dp_installed_files/activitystream/activitystream_digg/activitystream_digg.module	2008-05-20 17:35:54.000000000 -0500
+++ sites/all/modules/activitystream/activitystream_digg/activitystream_digg.module	2008-07-26 13:38:03.000000000 -0500
@@ -43,7 +43,7 @@ function activitystream_digg_activitystr
   $form['activitystream_digg']['activitystream_digg_userid'] = array(
     '#type' => 'textfield',
     '#title' => t('Username'),
-    '#default_value' => $edit['activitystream_digg_userid'],
+    '#default_value' => (isset($edit['activitystream_digg_userid'])) ? $edit['activitystream_digg_userid'] : '',
     '#description' => t('Your digg username'));
   return $form;	
 }
diff -urp ../dp_installed_files/activitystream/activitystream_feed/activitystream_feed.module sites/all/modules/activitystream/activitystream_feed/activitystream_feed.module
--- ../dp_installed_files/activitystream/activitystream_feed/activitystream_feed.module	2008-05-20 17:35:54.000000000 -0500
+++ sites/all/modules/activitystream/activitystream_feed/activitystream_feed.module	2008-07-26 13:36:17.000000000 -0500
@@ -59,7 +59,7 @@ function activitystream_feed_activitystr
     '#type' => 'textarea',
     '#title' => t('Feed URL'),
   '#rows' => 15,
-    '#default_value' => $edit['activitystream_feed_feed'],
+    '#default_value' => (isset($edit['activitystream_feed_feed'])) ? $edit['activitystream_feed_feed'] : '',
     '#description' => t('URL of the feeds to import as an activity stream. Multiple feeds are allowed; place each on a seperate line.'));
   return $form;	
 }
diff -urp ../dp_installed_files/activitystream/activitystream_flickr/activitystream_flickr.module sites/all/modules/activitystream/activitystream_flickr/activitystream_flickr.module
--- ../dp_installed_files/activitystream/activitystream_flickr/activitystream_flickr.module	2008-05-20 17:35:54.000000000 -0500
+++ sites/all/modules/activitystream/activitystream_flickr/activitystream_flickr.module	2008-07-26 13:36:55.000000000 -0500
@@ -84,7 +84,7 @@ function activitystream_flickr_activitys
   $form['activitystream_flickr']['activitystream_flickr_userid'] = array(
     '#type' => 'textfield',
     '#title' => t('Username'),
-    '#default_value' => $edit['activitystream_flickr_userid'],
+    '#default_value' => (isset($edit['activitystream_flickr_userid'])) ? $edit['activitystream_flickr_userid'] : '',
     '#description' => t('The username for your Flickr account'));
   return $form;	
 }
diff -urp ../dp_installed_files/activitystream/activitystream_lastfm/activitystream_lastfm.module sites/all/modules/activitystream/activitystream_lastfm/activitystream_lastfm.module
--- ../dp_installed_files/activitystream/activitystream_lastfm/activitystream_lastfm.module	2008-05-20 17:35:55.000000000 -0500
+++ sites/all/modules/activitystream/activitystream_lastfm/activitystream_lastfm.module	2008-07-26 13:37:15.000000000 -0500
@@ -43,7 +43,7 @@ function activitystream_lastfm_activitys
   $form['activitystream_lastfm']['activitystream_lastfm_userid'] = array(
     '#type' => 'textfield',
     '#title' => t('Username'),
-    '#default_value' => $edit['activitystream_lastfm_userid'],
+    '#default_value' => (isset($edit['activitystream_lastfm_userid'])) ? $edit['activitystream_lastfm_userid'] : '',
     '#description' => t('The username for your lastfm account'));
   return $form;	
 }
diff -urp ../dp_installed_files/activitystream/activitystream_twitter/activitystream_twitter.module sites/all/modules/activitystream/activitystream_twitter/activitystream_twitter.module
--- ../dp_installed_files/activitystream/activitystream_twitter/activitystream_twitter.module	2008-05-20 17:35:55.000000000 -0500
+++ sites/all/modules/activitystream/activitystream_twitter/activitystream_twitter.module	2008-07-26 13:37:37.000000000 -0500
@@ -49,7 +49,7 @@ function activitystream_twitter_activity
   $form['activitystream_twitter']['activitystream_twitter_userid'] = array(
     '#type' => 'textfield',
     '#title' => t('Username'),
-    '#default_value' => $edit['activitystream_twitter_userid'],
+    '#default_value' => (isset($edit['activitystream_twitter_userid'])) ? $edit['activitystream_twitter_userid'] : '',
     '#description' => t('The username for your Twitter account'));
   return $form;	
 }