diff --git a/contact.php b/contact.php
index 398dc8000..17074fb5e 100644
--- a/contact.php
+++ b/contact.php
@@ -13,6 +13,12 @@
 require_once("class2.php");
 //define('e_HANDLER', "e107_handlers/");
 // security image may be disabled by removing the appropriate shortcodes from the template.
+$active = varset($pref['contact_visibility'], e_UC_PUBLIC);
+if(!check_class($active))
+{
+	e107::getRedirect()->go(e_HTTP."index.php");
+}
+
 require_once(e_HANDLER."secure_img_handler.php");
 $sec_img = new secure_image;
 
diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 03edfd05a..db54317b9 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -600,6 +600,13 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
 							<div class='smalltext field-help'>".PRFLAN_169."</div>
 						</td>
 					</tr>
+					<tr>
+						<td><label for='contact_visibility'>Contact Page Visibility</label></td>
+						<td>
+							".$e_userclass->uc_dropdown('contact_visibility', varset( $pref['contact_visibility'],e_UC_PUBLIC), 'public,nobody,main,admin,classes', "tabindex='".$frm->getNext()."'")."
+							<div class='smalltext field-help'>Contact information and/or form will only be visible to this userclass group.</div>
+						</td>
+					</tr>
 					<tr>
 						<td><label for='contact-emailcopy'>".PRFLAN_164."</label></td>
 						<td>";
diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml
index 3a16624a4..0627fbd53 100644
--- a/e107_core/xml/default_install.xml
+++ b/e107_core/xml/default_install.xml
@@ -30,6 +30,7 @@
 		<core name="comments_sort">desc</core>
 		<core name="compress_output">0</core>
 		<core name="contact_emailcopy">0</core>
+        <core name="contact_visibility">0</core>
 		<core name="cookie_name">e107cookie</core>
 		<core name="core-infopanel-default"><![CDATA[array (
   0 => 'e-administrator',