diff --git a/sf_node/sf_node.module b/sf_node/sf_node.module
index 04f66ed..feb77e5 100644
--- a/sf_node/sf_node.module
+++ b/sf_node/sf_node.module
@@ -130,7 +130,7 @@ function sf_node_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
 
       // 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');
+        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 e24b6a6..b77888b 100644
--- a/sf_user/sf_user.module
+++ b/sf_user/sf_user.module
@@ -141,7 +141,7 @@ function sf_user_user($op, &$edit, &$account, $category = NULL) {
 
       // 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');
+        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