diff --git a/e107_admin/admin.php b/e107_admin/admin.php
index cc20a34d6..1bc77bad6 100644
--- a/e107_admin/admin.php
+++ b/e107_admin/admin.php
@@ -254,14 +254,26 @@ class admin_start
 			return null;
 		}
 
+		$checked = e107::getSession()->get('core-update-checked');
+
+		if(!deftrue('e_DEBUG') &&  $checked === true)
+		{
+			return null;
+		}
+
 		//$sc = e107::getScBatch('admin');
 		//echo $tp->parseTemplate('{ADMIN_COREUPDATE=alert}',true, $sc);
 
+
+
 		global $dont_check_update, $e107info;
 		global $dbupdate, $dbupdatep, $e107cache;
 
 		require_once(e_ADMIN.'update_routines.php');
 
+		e107::getSession()->set('core-update-checked',true);
+
+
 		if(update_check() === true)
 		{
 			if(e_DEBUG !== true)
diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php
index 2928caf58..0ffab483a 100644
--- a/e107_admin/update_routines.php
+++ b/e107_admin/update_routines.php
@@ -53,6 +53,7 @@ if(is_readable(e_ADMIN.'ver.php'))
 }
 
 $mes = e107::getMessage();
+/*
 // If $dont_check_update is both defined and TRUE on entry, a check for update is done only once per 24 hours.
 $dont_check_update = varset($dont_check_update, FALSE);
 
@@ -69,8 +70,9 @@ if ($dont_check_update === TRUE)
 		}
 	}
 }
+*/
 
-
+$dont_check_update = false;
 
 if (!$dont_check_update)
 {
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 3babb048f..427986eab 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -3678,7 +3678,7 @@ class e_parser
 			return $link;
 		}
 
-		return "<a href='".$link."'>-attachment-</a>"; //TODO Add pref for this. 
+		return "<a href='".$link."'>-attachment-</a>"; //TODO Add pref for this.
 	}
 
 	/**