diff --git a/e107_files/shortcode/batch/user_shortcodes.php b/e107_files/shortcode/batch/user_shortcodes.php
index cccd954c4..7879d81e3 100644
--- a/e107_files/shortcode/batch/user_shortcodes.php
+++ b/e107_files/shortcode/batch/user_shortcodes.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/user_shortcodes.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2007-03-27 13:48:30 $
-|     $Author: lisa_ $
+|     $Revision: 1.4 $
+|     $Date: 2007-05-11 19:57:07 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -282,8 +282,11 @@ return $user['user_forums'] ? "<a href='".e_HTTP."userposts.php?0.forums.".$user
 SC_END
 
 SC_BEGIN USER_SENDPM
-global $tp, $user;
-return $tp->parseTemplate("{SENDPM={$user['user_id']}}");
+global $pref, $tp, $user;
+if(isset($pref['plug_installed']['pm']) && ($user['user_id'] > 0))
+{
+  return $tp->parseTemplate("{SENDPM={$user['user_id']}}");
+}
 SC_END
 
 SC_BEGIN USER_RATING
diff --git a/e107_plugins/forum/forum_shortcodes.php b/e107_plugins/forum/forum_shortcodes.php
index 94f9e6ab2..c4ce23e29 100644
--- a/e107_plugins/forum/forum_shortcodes.php
+++ b/e107_plugins/forum/forum_shortcodes.php
@@ -30,8 +30,9 @@ return $ret;
 SC_END
 	
 SC_BEGIN PRIVMESSAGE
-global $post_info, $tp;
-if($post_info['user_id'] > 0){
+global $pref, $post_info, $tp;
+if(isset($pref['plug_installed']['pm']) && ($post_info['user_id'] > 0))
+{
 	return $tp->parseTemplate("{SENDPM={$post_info['user_id']}}");
 }
 SC_END