diff --git a/main/admin/index.php b/main/admin/index.php
index c5dd499e9b..11b62a7e86 100644
--- a/main/admin/index.php
+++ b/main/admin/index.php
@@ -295,12 +295,14 @@ if (api_is_platform_admin()) {
     //Version check
     $blocks['version_check']['icon']  = Display::return_icon('logo.png', 'Chamilo.org', array(), ICON_SIZE_SMALL, false);
 	$blocks['version_check']['label'] = get_lang('VersionCheck');
-	$blocks['version_check']['extra'] = version_check();
+	//$blocks['version_check']['extra'] = version_check();
     $blocks['version_check']['search_form'] = null;
     $blocks['version_check']['items'] = null;
 }
+$admin_ajax_url = api_get_path(WEB_AJAX_PATH).'admin.ajax.php';
 
 $tpl = new Template();
+$tpl->assign('web_admin_ajax_url', $admin_ajax_url);
 $tpl->assign('blocks', $blocks);
 $admin_template = $tpl->get_template('admin/settings_index.tpl');
 $content = $tpl->fetch($admin_template);
@@ -308,6 +310,30 @@ $tpl->assign('content', $content);
 $tpl->assign('message', $message);
 $tpl->display_one_col_template();
 
+
+
+/**
+ * This setting changes the registration status for the campus
+ *
+ * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+ * @version August 2006
+ *
+ * @todo the $_settings should be reloaded here. => write api function for this and use this in global.inc.php also.
+ */
+function register_site() {
+    $tbl_settings = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+
+    $sql = "UPDATE $tbl_settings SET selected_value='true' WHERE variable='registered'";
+    $result = Database::query($sql);
+
+    if ($_POST['donotlistcampus']) {
+        $sql = "UPDATE $tbl_settings SET selected_value='true' WHERE variable='donotlistcampus'";
+        $result = Database::query($sql);
+    }
+    // Reload the settings.
+}
+
+
 /**
  * Displays either the text for the registration or the message that the installation is (not) up to date
  *
@@ -338,28 +364,6 @@ function version_check() {
     return $return;
 }
 
-/**
- * This setting changes the registration status for the campus
- *
- * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
- * @version August 2006
- *
- * @todo the $_settings should be reloaded here. => write api function for this and use this in global.inc.php also.
- */
-function register_site() {
-    $tbl_settings = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
-
-    $sql = "UPDATE $tbl_settings SET selected_value='true' WHERE variable='registered'";
-    $result = Database::query($sql);
-
-    if ($_POST['donotlistcampus']) {
-        $sql = "UPDATE $tbl_settings SET selected_value='true' WHERE variable='donotlistcampus'";
-        $result = Database::query($sql);
-    }
-    // Reload the settings.
-}
-
-
 /**
  * Check if the current installation is up to date
  * The code is borrowed from phpBB and slighlty modified
diff --git a/main/inc/ajax/admin.ajax.php b/main/inc/ajax/admin.ajax.php
index fd9c8a9ba0..c7bd8a2eec 100644
--- a/main/inc/ajax/admin.ajax.php
+++ b/main/inc/ajax/admin.ajax.php
@@ -5,6 +5,7 @@
  */
 
 require_once '../global.inc.php';
+require_once api_get_path(SYS_CODE_PATH).'admin/statistics/statistics.lib.php';
 
 api_protect_admin_script();
 
@@ -28,4 +29,144 @@ switch ($action) {
             }        
         }
         break;
+        
+    case 'version':
+        echo version_check();
+        break;
+}
+    
+
+/**
+ * Displays either the text for the registration or the message that the installation is (not) up to date
+ *
+ * @return string html code
+ * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+ * @version august 2006
+ * @todo have a 6monthly re-registration
+ */
+function version_check() {
+    $tbl_settings = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $sql = 'SELECT selected_value FROM  '.$tbl_settings.' WHERE variable="registered" ';
+    $result = Database::query($sql);
+    $row = Database::fetch_array($result, 'ASSOC');
+
+    // The site has not been registered yet.
+    $return = '';
+    if ($row['selected_value'] == 'false') {
+        $return .= get_lang('VersionCheckExplanation');
+        $return .= '<form class="well" action="'.api_get_self().'" id="VersionCheck" name="VersionCheck" method="post">';
+        $return .= '<label class="checkbox"><input type="checkbox" name="donotlistcampus" value="1" id="checkbox" />'.get_lang('HideCampusFromPublicPlatformsList');
+        $return .= '</label><button type="submit" class="btn btn-primary" name="Register" value="'.get_lang('EnableVersionCheck').'" id="register" >'.get_lang('EnableVersionCheck').'</button>';
+        $return .= '</form>';
+        check_system_version();
+    } else {
+        // site not registered. Call anyway
+        $return .= check_system_version();
+    }
+    return $return;
+}
+
+/**
+ * Check if the current installation is up to date
+ * The code is borrowed from phpBB and slighlty modified
+ * @author The phpBB Group <support@phpbb.com> (the code)
+ * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University (the modifications)
+ * @author Yannick Warnier <ywarnier@beeznest.org> for the move to HTTP request
+ * @copyright (C) 2001 The phpBB Group
+ * @return language string with some layout (color)
+ */
+function check_system_version() {
+    global $_configuration;
+    $system_version = trim($_configuration['system_version']); // the chamilo version of your installation
+
+    if (ini_get('allow_url_fopen') == 1) {
+        // The number of courses
+        $number_of_courses = statistics::count_courses();
+
+        // The number of users
+        $number_of_users = statistics::count_users();
+        $number_of_active_users = statistics::count_users(null,null,null,true);
+
+        $data = array(
+            'url' => api_get_path(WEB_PATH),
+            'campus' => api_get_setting('siteName'),
+            'contact' => api_get_setting('emailAdministrator'),
+            'version' => $system_version,
+            'numberofcourses' => $number_of_courses,
+            'numberofusers' => $number_of_users,
+            'numberofactiveusers' => $number_of_active_users,
+            //The donotlistcampus setting recovery should be improved to make
+            // it true by default - this does not affect numbers counting
+            'donotlistcampus' => api_get_setting('donotlistcampus'),
+            'organisation' => api_get_setting('Institution'),
+            'language' => api_get_setting('platformLanguage'),
+            'adminname' => api_get_setting('administratorName').' '.api_get_setting('administratorSurname'),
+        );
+
+        $res = _http_request('version.chamilo.org', 80, '/version.php', $data);
+
+        if ($res != 0) {
+            $version_info = $res;
+
+            if ($system_version != $version_info) {
+                $output = '<br /><span style="color:red">' . get_lang('YourVersionNotUpToDate') . '. '.get_lang('LatestVersionIs').' <b>Chamilo '.$version_info.'</b>. '.get_lang('YourVersionIs').' <b>Chamilo '.$system_version. '</b>. '.str_replace('http://www.chamilo.org', '<a href="http://www.chamilo.org">http://www.chamilo.org</a>', get_lang('PleaseVisitOurWebsite')).'</span>';
+            } else {
+                $output = '<br /><span style="color:green">'.get_lang('VersionUpToDate').': Chamilo '.$version_info.'</span>';
+            }
+        } else {
+            $output = '<span style="color:red">' . get_lang('ImpossibleToContactVersionServerPleaseTryAgain') . '</span>';
+        }
+    } else {
+        $output = '<span style="color:red">' . get_lang('AllowurlfopenIsSetToOff') . '</span>';
+    }
+    return $output;
+}
+
+/**
+ * Function to make an HTTP request through fsockopen (specialised for GET)
+ * Derived from Jeremy Saintot: http://www.php.net/manual/en/function.fsockopen.php#101872
+ * @param string IP or hostname
+ * @param int    Target port
+ * @param string URI (defaults to '/')
+ * @param array  GET data
+ * @param float  Timeout
+ * @param bool   Include HTTP Request headers?
+ * @param bool   Include HTTP Response headers?
+ */
+function _http_request($ip, $port = 80, $uri = '/', $getdata = array(), $timeout = 1, $req_hdr = false, $res_hdr = false) {
+    $verb = 'GET';
+    $ret = '';
+    $getdata_str = count($getdata) ? '?' : '';
+
+    foreach ($getdata as $k => $v) {
+                $getdata_str .= urlencode($k) .'='. urlencode($v) . '&';
+    }
+
+    $crlf = "\r\n";
+    $req = $verb .' '. $uri . $getdata_str .' HTTP/1.1' . $crlf;
+    $req .= 'Host: '. $ip . $crlf;
+    $req .= 'User-Agent: Mozilla/5.0 Firefox/3.6.12' . $crlf;
+    $req .= 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' . $crlf;
+    $req .= 'Accept-Language: en-us,en;q=0.5' . $crlf;
+    $req .= 'Accept-Encoding: deflate' . $crlf;
+    $req .= 'Accept-Charset: utf-8;q=0.7,*;q=0.7' . $crlf;
+
+    $req .= $crlf;
+
+    if ($req_hdr) { $ret .= $req; }
+    if (($fp = @fsockopen($ip, $port, $errno, $errstr, $timeout)) == false) {
+        return "Error $errno: $errstr\n";
+    }
+
+    stream_set_timeout($fp, $timeout);
+    $r = @fwrite($fp, $req);
+    $line = @fread($fp,512);
+    $ret .= $line;
+    fclose($fp);
+
+    if (!$res_hdr) {
+        $ret = substr($ret, strpos($ret, "\r\n\r\n") + 4);
+    }
+
+    return trim($ret);
 }
diff --git a/main/template/default/admin/settings_index.tpl b/main/template/default/admin/settings_index.tpl
index 7d2d8f750e..6bdff8e488 100644
--- a/main/template/default/admin/settings_index.tpl
+++ b/main/template/default/admin/settings_index.tpl
@@ -1,7 +1,12 @@
 <script>
-$(function() {
-    //$("#settings").tabs();
-});
+$(document).ready(function() {
+    $.ajax({    
+        url:'{{web_admin_ajax_url}}?a=version',
+        success:function(version){
+            $(".admin-block-version").html(version);
+        } 
+    });
+});    
 </script>
 
 <div id="settings">
@@ -36,11 +41,19 @@ $(function() {
                     </ul>    	
                 {% endif %}
                 
+                {% if block_item.label == 'VersionCheck'|get_lang %}
+                    <div class="admin-block-version"> 
+                {% endif %}
+                
+                {% if block_item.label == 'VersionCheck'|get_lang %}
+                    </div> 
+                {% endif %}
                 {% if block_item.extra is not null %}
                     <div>
                     {{ block_item.extra }}
                     </div>
-                {% endif %}                
+                {% endif %}
+                                
             </div>
         {% if block_item.label == 'VersionCheck'|get_lang %}
                </div>