--- campaignmonitor.module	2009-05-02 16:59:14.000000000 +0000
+++ campaignmonitor.module	2009-05-02 16:56:15.000000000 +0000
@@ -165,12 +165,10 @@ function campaignmonitor_admin() {
     '#description' => t('Choose which forms you want to display the Join Newsletter checkbox.')
   );
   
-  $form['campaignmonitor_checkboxisplaytext'] = array(
+  $form['campaignmonitor_checkboxdisplaytext'] = array(
     '#type' => 'textfield',
     '#title' => t('Display Text for Checkbox'),
     '#default_value' => variable_get('campaignmonitor_checkboxdisplaytext', 'Join our Newsletter?'),
-    '#size' => 50,
-    '#maxlength' => 50,
     '#description' => t("This text will display next to the checkbox on the selected forms.")
   );
   
@@ -235,7 +233,7 @@ function campaignmonitor_user_form() {
 
   $form['subscribe_newsletter'] = array(
     '#type'          => 'checkbox',
-    '#title'         => variable_get('campaignmonitor_user_pagedisplaytext', 'Newsletter'),
+    '#title'         => variable_get('campaignmonitor_userpagedisplaytext', 'Newsletter'),
     '#default_value' => $default,
   );
   $form['is_subscribed'] = array(
@@ -261,7 +259,7 @@ function campaignmonitor_user_form_submi
   global $user;
   // Check if the profile module is installed. If it is, use the name element of the profile
 	if (module_exists("profile")) {
-  	profile_load_profile($user->uid);
+  	profile_load_profile($user);
 		$profile_name = $user->profile_name;
 	}
   // Replace api_key and list_id with your own details