--- C:/Users/Todd/Desktop/uc_cim/uc_cim.module	Fri May 08 02:57:24 2009
+++ D:/SITES/root/dedicated/agatho.com/sites/all/modules/uc_cim/uc_cim.module	Tue May 12 15:41:49 2009
@@ -85,7 +85,8 @@
         'title' => 'Manage Credit Cards',
         'page callback' => 'drupal_get_form',
         'page arguments' => array('uc_cim_manage_page_form',1),
-        'access callback' => 'user_is_logged_in',
+        'access callback' => 'uc_cim_manage_cards_access',
+				'access arguments' => array(1),
         'type' => MENU_LOCAL_TASK,
       );
   return $items;
@@ -445,7 +446,13 @@
 				
 				//Set a message for the user to let them know their username and password
 				$userid = $account->uid;
-				drupal_set_message(t("Your user account has been created. Your username is '%s' and your password is '%s'. These can be edited '%s'.",$name,$fields['pass'],l(t('here'),"user/$userid/edit")));
+				$message = t("Your user account has been created. Your username is '%name' and your password is '%pass'. These can be edited",array(
+						'%name' => $name,
+						'%pass' => $fields['pass'],
+					)
+				);
+				$message .= ' ' .  l(t('here'),"user/$userid/edit") . '.';
+				drupal_set_message($message);
 				
 				// Send the customer their account details if enabled.
 				if (variable_get('uc_new_customer_email', TRUE)) {
@@ -1646,6 +1653,12 @@
   return $ops;
 }
 
+/**
+ * Access callback for credit card management.
+ */
+function uc_cim_manage_cards_access($account) {
+  return (($GLOBALS['user']->uid == $account->uid) || user_access('administer credit cards')) && $account->uid > 0;
+}
 
 /*END Callbacks*/