diff --git a/contact.php b/contact.php
index c399bc934..4b149e9d0 100644
--- a/contact.php
+++ b/contact.php
@@ -22,10 +22,6 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 require_once(HEADERF);
 
 
-
-
-
-
 if (!vartrue($CONTACT_FORM))
  {
 	if (file_exists(THEME."contact_template.php")) 
@@ -156,8 +152,13 @@ if(isset($_POST['send-contactus']))
 
 }
 
-if(SITECONTACTINFO && $CONTACT_INFO)
+if(SITECONTACTINFO)
 {
+	if(!isset($CONTACT_INFO))
+	{
+		$CONTACT_INFO = e107::getCoreTemplate('contact','info'); 
+	}
+	
 	$text = $tp->parseTemplate($CONTACT_INFO, TRUE, vartrue($contact_shortcodes));
 	$ns -> tablerender(LANCONTACT_01, $text,"contact");
 }
diff --git a/e107_core/templates/contact_template.php b/e107_core/templates/contact_template.php
index ee2805c1a..d455d9e29 100644
--- a/e107_core/templates/contact_template.php
+++ b/e107_core/templates/contact_template.php
@@ -2,8 +2,8 @@
 // $Id$
 
 if (!defined('e107_INIT')) { exit; }
-if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:97%"); }
 
+/*
 if(!isset($CONTACT_INFO))
 {
 	$CONTACT_INFO = "
@@ -16,8 +16,15 @@ if(!isset($CONTACT_INFO))
 	</tr>
 	</table>";
 }
+*/
 
+$CONTACT_TEMPLATE['info'] = "
 
+	<div class='contact-info' >
+		<address>{SITECONTACTINFO}</address>
+	</div>
+
+";
 
 
 $CONTACT_TEMPLATE['menu'] =  '