diff --git a/sf_node/sf_node.module b/sf_node/sf_node.module
index f8fa2a0..c58da61 100644
--- a/sf_node/sf_node.module
+++ b/sf_node/sf_node.module
@@ -129,8 +129,8 @@ function sf_node_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
       $salesforce->name = $map->name;
 
       // Check if there is more than one fieldmap in the result.
-      if (user_access('administer salesforce') and next($maps)) {
-        drupal_set_message(t('Warning: more than one "automatic" salesforce mapping detected. Used fieldmap @map.', array('@map' => $map->name)), 'warning');
+      if (user_access('administer salesforce') AND next($maps)) {
+        drupal_set_message(t('Warning: more than one "automatic" salesforce mapping detected. Used fieldmap !map_name @map_description.', array('!map_name' => l($map->name, SALESFORCE_PATH_FIELDMAPS . '/' . $map->name . '/edit'), '@map_description' => '(' . $map->description . ')')), 'warning');
       }
 
       // Finally, export the node to Salesforce.
 
diff --git a/sf_user/sf_user.module b/sf_user/sf_user.module
index 2c90ca5..27d1d26 100644
--- a/sf_user/sf_user.module
+++ b/sf_user/sf_user.module
@@ -140,8 +140,8 @@ function sf_user_user($op, &$edit, &$account, $category = NULL) {
       $salesforce->name = $map->name;
 
       // Check if there is more than one fieldmap in the result.
-      if (user_access('administer salesforce') and next($maps)) {
-        drupal_set_message(t('Warning: more than one "automatic" salesforce mapping detected. Used fieldmap @map.', array('@map' => $map->name)), 'warning');
+      if (user_access('administer salesforce') AND next($maps)) {
+        drupal_set_message(t('Warning: more than one "automatic" salesforce mapping detected. Used fieldmap !map_name @map_description.', array('!map_name' => l($map->name, SALESFORCE_PATH_FIELDMAPS . '/' . $map->name . '/edit'), '@map_description' => '(' . $map->description . ')')), 'warning');
       }
 
       // Finally export the user to salesforce