diff --git a/e107_plugins/pm/pm.php b/e107_plugins/pm/pm.php
index 47ce93f61..5baccb963 100755
--- a/e107_plugins/pm/pm.php
+++ b/e107_plugins/pm/pm.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2008-11-08 17:11:44 $
+|     $Revision: 1.9 $
+|     $Date: 2009-02-02 17:42:59 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -329,7 +329,7 @@ function post_pm()
 			{
 				return LAN_PM_15;
 			}
-			elseif(!check_class($_POST['pm_userclass']) && !ADMIN)
+			elseif((!check_class($_POST['pm_userclass']) || !check_class($pm_prefs['multi_class'])) && !ADMIN)
 			{
 				return LAN_PM_16;
 			}
diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php
index 12d8232ce..6884acae9 100755
--- a/e107_plugins/pm/pm_shortcodes.php
+++ b/e107_plugins/pm/pm_shortcodes.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_shortcodes.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2008-11-25 17:38:56 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.9 $
+|     $Date: 2009-02-02 17:43:00 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -48,7 +48,7 @@ if($pm_info['from_name'])
 {
 	return "";
 }
-if($pm_prefs['allow_userclass'])
+if($pm_prefs['allow_userclass'] && check_class($pm_prefs['multi_class']))
 {
 	$ret = "<input type='checkbox' name='to_userclass' value='1' />".LAN_PM_4." ";
 	require_once(e_HANDLER."userclass_class.php");