diff --git a/custompages/language.inc.php b/custompages/language.inc.php
index 3145e91773..8698b8f9f2 100755
--- a/custompages/language.inc.php
+++ b/custompages/language.inc.php
@@ -59,7 +59,7 @@ $chamilo_langs = array(null => 'english', 'en' => 'english', 'fr' => 'french', '
 $available_langs = array('en','fr');
 
 // Which language files will we need ?
-$language_file = array('registration', 'admin');
+$language_file = array('admin');
 
 // Let's find out which language to serve to this particular browser
 $lang_match = $chamilo_langs[get_preferred_language($available_langs)];
diff --git a/custompages/language.php b/custompages/language.php
index 724d5d91ca..90c6f2373a 100755
--- a/custompages/language.php
+++ b/custompages/language.php
@@ -35,7 +35,7 @@ function custompages_get_lang($variable) {
 	return get_lang($variable, null, $_SESSION['user_language_choice']);
 }
 
-$language_file = array('registration', 'admin');
+$language_file = array('admin');
 $available_langs = array('en', 'fr', 'es');
 $chamilo_langs = array(null => 'english', 'en' => 'english', 'fr' => 'french', 'nl' => 'dutch', 'de' => 'german', 'es' => 'spanish');
 $lang_match = $chamilo_langs[get_preferred_language($available_langs)];
diff --git a/main/admin/add_courses_to_usergroup.php b/main/admin/add_courses_to_usergroup.php
index 843e8e61d0..91218a8297 100755
--- a/main/admin/add_courses_to_usergroup.php
+++ b/main/admin/add_courses_to_usergroup.php
@@ -5,7 +5,7 @@
 */
 
 // Name of the language file that needs to be included.
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 
 // Resetting the course id.
 $cidReset = true;
diff --git a/main/admin/add_sessions_to_promotion.php b/main/admin/add_sessions_to_promotion.php
index f4acb440fc..d36475cc1a 100755
--- a/main/admin/add_sessions_to_promotion.php
+++ b/main/admin/add_sessions_to_promotion.php
@@ -5,7 +5,7 @@
 */
 
 // name of the language file that needs to be included
-$language_file = array('admin','registration');
+$language_file = array('admin');
 
 // resetting the course id
 $cidReset = true;
diff --git a/main/admin/add_sessions_to_usergroup.php b/main/admin/add_sessions_to_usergroup.php
index 424cdf0add..dafaa3490b 100755
--- a/main/admin/add_sessions_to_usergroup.php
+++ b/main/admin/add_sessions_to_usergroup.php
@@ -5,7 +5,7 @@
 */
 
 // name of the language file that needs to be included
-$language_file=array('admin','registration');
+$language_file=array('admin');
 
 // resetting the course id
 $cidReset=true;
diff --git a/main/admin/add_students_to_session.php b/main/admin/add_students_to_session.php
index d58ebbe13e..900ca4e395 100755
--- a/main/admin/add_students_to_session.php
+++ b/main/admin/add_students_to_session.php
@@ -5,7 +5,7 @@
  */
 
 // name of the language file that needs to be included
-$language_file = array('admin','registration');
+$language_file = array('admin');
 
 // resetting the course id
 $cidReset = true;
diff --git a/main/admin/add_teachers_to_session.php b/main/admin/add_teachers_to_session.php
index 6e4067933f..61e15790cf 100755
--- a/main/admin/add_teachers_to_session.php
+++ b/main/admin/add_teachers_to_session.php
@@ -5,7 +5,7 @@
  */
 
 // name of the language file that needs to be included
-$language_file = array('admin','registration');
+$language_file = array('admin');
 
 // resetting the course id
 $cidReset = true;
diff --git a/main/admin/add_users_to_group.php b/main/admin/add_users_to_group.php
index 8b23b5c6e8..10b550be8d 100755
--- a/main/admin/add_users_to_group.php
+++ b/main/admin/add_users_to_group.php
@@ -5,7 +5,7 @@
 */
 
 // name of the language file that needs to be included
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 
 // resetting the course id
 $cidReset = true;
diff --git a/main/admin/add_users_to_session.php b/main/admin/add_users_to_session.php
index 5430f84677..a7de47f640 100755
--- a/main/admin/add_users_to_session.php
+++ b/main/admin/add_users_to_session.php
@@ -6,7 +6,7 @@
 */
 
 // name of the language file that needs to be included
-$language_file = array('admin','registration');
+$language_file = array('admin');
 
 // resetting the course id
 $cidReset = true;
diff --git a/main/admin/add_users_to_usergroup.php b/main/admin/add_users_to_usergroup.php
index e53599c2d7..3fe45e4a23 100755
--- a/main/admin/add_users_to_usergroup.php
+++ b/main/admin/add_users_to_usergroup.php
@@ -5,7 +5,7 @@
 */
 
 // name of the language file that needs to be included
-$language_file = array('admin','registration');
+$language_file = array('admin');
 
 // resetting the course id
 $cidReset = true;
diff --git a/main/admin/class_import.php b/main/admin/class_import.php
index 9795c6a8cc..d6b244e4d2 100755
--- a/main/admin/class_import.php
+++ b/main/admin/class_import.php
@@ -47,7 +47,7 @@ function save_data($classes) {
 }
 
 // Language files that should be included.
-$language_file = array ('admin', 'registration');
+$language_file = array ('admin');
 
 // Resetting the course id.
 $cidReset = true;
diff --git a/main/admin/class_user_import.php b/main/admin/class_user_import.php
index b8d7c6bac8..7d78beea30 100755
--- a/main/admin/class_user_import.php
+++ b/main/admin/class_user_import.php
@@ -131,7 +131,7 @@ function parse_csv_data($file) {
     return $courses;
 }
 
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/admin/configure_inscription.php b/main/admin/configure_inscription.php
index 8ea65fc4b1..ca9116ce33 100755
--- a/main/admin/configure_inscription.php
+++ b/main/admin/configure_inscription.php
@@ -6,7 +6,7 @@
  *	@package	 chamilo.admin
  */
 
-$language_file = array('registration', 'admin');
+$language_file = array('admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 
diff --git a/main/admin/configure_plugin.php b/main/admin/configure_plugin.php
index 1c5325aa42..29e68506dd 100755
--- a/main/admin/configure_plugin.php
+++ b/main/admin/configure_plugin.php
@@ -8,7 +8,7 @@
 use \ChamiloSession as Session;
 
 // name of the language file that needs to be included
-$language_file = array('registration', 'admin');
+$language_file = array('admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 
diff --git a/main/admin/course_add.php b/main/admin/course_add.php
index b804c608c4..fe7214a960 100755
--- a/main/admin/course_add.php
+++ b/main/admin/course_add.php
@@ -6,7 +6,7 @@
  */
 
 // Language files that need to be included.
-$language_file = array('admin', 'create_course');
+$language_file = array('admin');
 
 $cidReset = true;
 require_once '../inc/global.inc.php';
diff --git a/main/admin/course_export.php b/main/admin/course_export.php
index ffcebb9061..0c1542ee3b 100755
--- a/main/admin/course_export.php
+++ b/main/admin/course_export.php
@@ -7,7 +7,7 @@
 /**
  * Code
  */
-$language_file = array ('admin', 'registration','create_course', 'document');
+$language_file = array ('admin', 'document');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/admin/course_import.php b/main/admin/course_import.php
index 413411ed3c..d81a8ea7a8 100755
--- a/main/admin/course_import.php
+++ b/main/admin/course_import.php
@@ -155,7 +155,7 @@ function parse_csv_data($file)
     return $courses;
 }
 
-$language_file = array('admin', 'registration','create_course', 'document');
+$language_file = array('admin', 'document');
 
 $cidReset = true;
 
diff --git a/main/admin/course_request_accepted.php b/main/admin/course_request_accepted.php
index 376f8cf249..debfaa4a24 100755
--- a/main/admin/course_request_accepted.php
+++ b/main/admin/course_request_accepted.php
@@ -12,7 +12,7 @@
  */
 
 // Language files that need to be included.
-$language_file = array('admin', 'create_course');
+$language_file = array('admin');
 
 $cidReset = true;
 
diff --git a/main/admin/course_request_edit.php b/main/admin/course_request_edit.php
index 0b8a00b20a..b2d2f2b238 100755
--- a/main/admin/course_request_edit.php
+++ b/main/admin/course_request_edit.php
@@ -8,7 +8,7 @@
  */
 
 // Language files that need to be included.
-$language_file = array('admin', 'create_course');
+$language_file = array('admin');
 
 $cidReset = true;
 require_once '../inc/global.inc.php';
diff --git a/main/admin/course_request_rejected.php b/main/admin/course_request_rejected.php
index 8ebd1e74b7..3f99a8ab60 100755
--- a/main/admin/course_request_rejected.php
+++ b/main/admin/course_request_rejected.php
@@ -12,7 +12,7 @@
  */
 
 // Language files that need to be included.
-$language_file = array('admin', 'create_course');
+$language_file = array('admin');
 
 $cidReset = true;
 
diff --git a/main/admin/course_request_review.php b/main/admin/course_request_review.php
index 9f12f6ae18..b397fdeaad 100755
--- a/main/admin/course_request_review.php
+++ b/main/admin/course_request_review.php
@@ -11,7 +11,7 @@
  */
 
 // Language files that need to be included.
-$language_file = array('admin', 'create_course');
+$language_file = array('admin');
 
 $cidReset = true;
 require_once '../inc/global.inc.php';
diff --git a/main/admin/course_user_import.php b/main/admin/course_user_import.php
index 0b92eaf9d9..cb7297e603 100755
--- a/main/admin/course_user_import.php
+++ b/main/admin/course_user_import.php
@@ -134,7 +134,7 @@ function parse_csv_data($file)
 }
 
 // Language files that should be included,
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 $cidReset = true;
 
 include '../inc/global.inc.php';
diff --git a/main/admin/course_user_import_by_email.php b/main/admin/course_user_import_by_email.php
index f6a45b6928..9d93932fd9 100755
--- a/main/admin/course_user_import_by_email.php
+++ b/main/admin/course_user_import_by_email.php
@@ -139,7 +139,7 @@ function parse_csv_data($file)
 }
 
 // Language files that should be included,
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 $cidReset = true;
 
 include '../inc/global.inc.php';
diff --git a/main/admin/filler.php b/main/admin/filler.php
index 0f0b3fc810..47b0a46274 100755
--- a/main/admin/filler.php
+++ b/main/admin/filler.php
@@ -6,7 +6,7 @@
 *	@package chamilo.admin
 */
 // name of the language file that needs to be included <br />
-$language_file = array('admin','tracking','create_course');
+$language_file = array('admin','tracking');
 
 // resetting the course id
 $cidReset = true;
diff --git a/main/admin/group_add.php b/main/admin/group_add.php
index 222f8800a6..90a185f00f 100755
--- a/main/admin/group_add.php
+++ b/main/admin/group_add.php
@@ -5,7 +5,7 @@
 */
 
 // Language files that should be included
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 
 $cidReset = true;
 
diff --git a/main/admin/group_list.php b/main/admin/group_list.php
index ee24e9a168..e4d94374f7 100755
--- a/main/admin/group_list.php
+++ b/main/admin/group_list.php
@@ -7,7 +7,7 @@
 
  */
 // name of the language file that needs to be included
-$language_file = array('registration', 'admin');
+$language_file = array('admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 
diff --git a/main/admin/inactive_user_list.php b/main/admin/inactive_user_list.php
index d802fd55ae..5e5293611a 100755
--- a/main/admin/inactive_user_list.php
+++ b/main/admin/inactive_user_list.php
@@ -10,7 +10,7 @@
 */
 
 // name of the language file that needs to be included
-$language_file = array ('registration','admin');
+$language_file = array('admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 
diff --git a/main/admin/ldap_import_students.php b/main/admin/ldap_import_students.php
index 982b7e45c7..8ae9806dfa 100755
--- a/main/admin/ldap_import_students.php
+++ b/main/admin/ldap_import_students.php
@@ -10,7 +10,6 @@
  */
 // name of the language file that needs to be included
 $language_file[]='admin';
-$language_file[]='registration';
 // resetting the course id
 $cidReset=true;
 require_once('../inc/global.inc.php');
diff --git a/main/admin/ldap_import_students_to_session.php b/main/admin/ldap_import_students_to_session.php
index bbf8d9784a..53dc8ed994 100755
--- a/main/admin/ldap_import_students_to_session.php
+++ b/main/admin/ldap_import_students_to_session.php
@@ -10,7 +10,6 @@
  */
 // name of the language file that needs to be included
 $language_file[]='admin';
-$language_file[]='registration';
 // resetting the course id
 $cidReset=true;
 require_once('../inc/global.inc.php');
diff --git a/main/admin/ldap_users_list.php b/main/admin/ldap_users_list.php
index db84e8fb5f..1bcf4b600d 100755
--- a/main/admin/ldap_users_list.php
+++ b/main/admin/ldap_users_list.php
@@ -8,7 +8,6 @@
  * Init
  */
 // name of the language file that needs to be included
-$language_file[] = 'registration';
 $language_file[] = 'admin';
 $cidReset = true;
 require('../inc/global.inc.php');
diff --git a/main/admin/legal_add.php b/main/admin/legal_add.php
index a3b862ac20..ae689e9d3b 100755
--- a/main/admin/legal_add.php
+++ b/main/admin/legal_add.php
@@ -7,7 +7,7 @@
 /**
  * Code
  */
-$language_file = array('admin','registration');
+$language_file = array('admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
diff --git a/main/admin/session_course_user_list.php b/main/admin/session_course_user_list.php
index 350251533d..5837d7a1ef 100755
--- a/main/admin/session_course_user_list.php
+++ b/main/admin/session_course_user_list.php
@@ -4,7 +4,7 @@
 /**
 *	@package chamilo.admin
 */
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/admin/session_import.php b/main/admin/session_import.php
index 67f4255063..9ff33c8230 100755
--- a/main/admin/session_import.php
+++ b/main/admin/session_import.php
@@ -5,7 +5,7 @@
  * @package chamilo.admin
  */
 
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/admin/session_import_drh.php b/main/admin/session_import_drh.php
index 0b390f8c36..2bcfd1d9e4 100755
--- a/main/admin/session_import_drh.php
+++ b/main/admin/session_import_drh.php
@@ -5,7 +5,7 @@
  * @package chamilo.admin
  */
 
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/admin/session_user_import.php b/main/admin/session_user_import.php
index 30051ca927..67352e3051 100755
--- a/main/admin/session_user_import.php
+++ b/main/admin/session_user_import.php
@@ -5,7 +5,7 @@
  * @package chamilo.admin
  */
 
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/admin/skills_import.php b/main/admin/skills_import.php
index 28604bd409..9038e5c50e 100755
--- a/main/admin/skills_import.php
+++ b/main/admin/skills_import.php
@@ -8,7 +8,7 @@
 /**
  * Validate the imported data.
  */
-$language_file = array ('admin', 'registration');
+$language_file = array ('admin');
 
 $cidReset = true;
 require '../inc/global.inc.php';
diff --git a/main/admin/style_preview.php b/main/admin/style_preview.php
index b18f450e56..238943f644 100755
--- a/main/admin/style_preview.php
+++ b/main/admin/style_preview.php
@@ -10,7 +10,7 @@
 // @deprecated This page is not used
 
 exit;
-$language_file = array('create_course', 'admin');
+$language_file = array('admin');
 
 require_once '../inc/global.inc.php';
 
diff --git a/main/admin/system_status.php b/main/admin/system_status.php
index 7b8e928502..eec771c27f 100755
--- a/main/admin/system_status.php
+++ b/main/admin/system_status.php
@@ -6,7 +6,7 @@
 */
 
 // Language files that should be included
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/admin/user_add.php b/main/admin/user_add.php
index 17a2d1eb71..99d1801df4 100755
--- a/main/admin/user_add.php
+++ b/main/admin/user_add.php
@@ -5,7 +5,7 @@
 */
 
 // Language files that should be included
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 $cidReset = true;
 // Including necessary libraries.
 require_once '../inc/global.inc.php';
diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php
index b0c3962cc5..fddb99fa37 100755
--- a/main/admin/user_edit.php
+++ b/main/admin/user_edit.php
@@ -5,7 +5,7 @@
 */
 
 // Language files that should be included
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 
diff --git a/main/admin/user_fields.php b/main/admin/user_fields.php
index 2da0db8715..824c7762ac 100755
--- a/main/admin/user_fields.php
+++ b/main/admin/user_fields.php
@@ -4,7 +4,7 @@
 *	@package chamilo.admin
 */
 // name of the language file that needs to be included
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 $cidReset = true;
 
 // including necessary libraries
diff --git a/main/admin/user_fields_add.php b/main/admin/user_fields_add.php
index 7c6f5c79ca..305e517550 100755
--- a/main/admin/user_fields_add.php
+++ b/main/admin/user_fields_add.php
@@ -4,7 +4,7 @@
 *	@package chamilo.admin
 */
 // name of the language file that needs to be included
-$language_file = array('admin','registration');
+$language_file = array('admin');
 $cidReset = true;
 
 // including necessary libraries
diff --git a/main/admin/user_fields_options.php b/main/admin/user_fields_options.php
index f37913f6f9..e2c85c5913 100755
--- a/main/admin/user_fields_options.php
+++ b/main/admin/user_fields_options.php
@@ -4,7 +4,7 @@
 *	@package chamilo.admin
 */
 // name of the language file that needs to be included
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 
 // resetting the course information
 $cidReset = true;
diff --git a/main/admin/user_import.php b/main/admin/user_import.php
index 75b375c14e..e33d1aaf8f 100644
--- a/main/admin/user_import.php
+++ b/main/admin/user_import.php
@@ -9,7 +9,7 @@
  * Validate the imported data.
  */
 
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 
 $cidReset = true;
 require '../inc/global.inc.php';
diff --git a/main/admin/user_information.php b/main/admin/user_information.php
index 44d2fa6ddc..5c26ec22c9 100755
--- a/main/admin/user_information.php
+++ b/main/admin/user_information.php
@@ -7,7 +7,7 @@
  */
 
 // name of the language file that needs to be included
-$language_file = array('registration', 'tracking', 'exercice', 'admin', 'gradebook');
+$language_file = array('tracking', 'exercice', 'admin', 'gradebook');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
diff --git a/main/admin/user_list.php b/main/admin/user_list.php
index c9b3dc5ef4..a30483cf42 100755
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@@ -7,7 +7,7 @@
 */
 
 // name of the language file that needs to be included
-$language_file = array('registration','admin');
+$language_file = array('admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 
diff --git a/main/admin/user_update_import.php b/main/admin/user_update_import.php
index 9d5346d858..1adfd6a1e4 100644
--- a/main/admin/user_update_import.php
+++ b/main/admin/user_update_import.php
@@ -9,7 +9,7 @@
  * Validate the imported data.
  */
 
-$language_file = array ('admin', 'registration');
+$language_file = array ('admin');
 
 $cidReset = true;
 require '../inc/global.inc.php';
diff --git a/main/admin/usergroup_import.php b/main/admin/usergroup_import.php
index 27e0d226a9..3201dea111 100755
--- a/main/admin/usergroup_import.php
+++ b/main/admin/usergroup_import.php
@@ -72,7 +72,7 @@ function save_data($classes)
 }
 
 // Language files that should be included.
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 
 // Resetting the course id.
 $cidReset = true;
diff --git a/main/admin/usergroup_user_import.php b/main/admin/usergroup_user_import.php
index dbf2991314..93de5c8ebd 100755
--- a/main/admin/usergroup_user_import.php
+++ b/main/admin/usergroup_user_import.php
@@ -122,7 +122,7 @@ function parse_csv_data($file) {
     return $courses;
 }
 
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/auth/courses.php b/main/auth/courses.php
index 10fa471b71..a8f45ce586 100755
--- a/main/auth/courses.php
+++ b/main/auth/courses.php
@@ -7,10 +7,6 @@
 * @author Christian Fasanando <christian1827@gmail.com> - Beeznest
 * @package chamilo.auth
 */
-
-// Names of the language file that needs to be included.
-$language_file = array ('registration');
-
 // Delete the globals['_cid'], we don't need it here.
 $cidReset = true; // Flag forcing the 'current course' reset
 
diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index 993cdaedb0..b09b5c32c3 100755
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -8,7 +8,7 @@
 
 use \ChamiloSession as Session;
 
-$language_file = array('registration', 'admin');
+$language_file = array('admin');
 
 //quick hack to adapt the registration form result to the selected registration language
 if (!empty($_POST['language'])) {
diff --git a/main/auth/lostPassword.php b/main/auth/lostPassword.php
index 030fc75caf..f9131cbb80 100755
--- a/main/auth/lostPassword.php
+++ b/main/auth/lostPassword.php
@@ -17,9 +17,6 @@
 /**
  * Code
  */
-// name of the language file that needs to be included
-$language_file = array('registration');
-
 require_once '../inc/global.inc.php';
 
 // Custom pages
diff --git a/main/auth/my_progress.php b/main/auth/my_progress.php
index 5963053df2..536977d4aa 100755
--- a/main/auth/my_progress.php
+++ b/main/auth/my_progress.php
@@ -8,7 +8,7 @@
  * Code
  */
 // name of the language file that needs to be included
-$language_file = array('registration', 'tracking', 'exercice', 'admin', 'learnpath');
+$language_file = array('tracking', 'exercice', 'admin', 'learnpath');
 
 $cidReset = true;
 require_once '../inc/global.inc.php';
diff --git a/main/auth/profile.php b/main/auth/profile.php
index 459091e666..6b6d759513 100755
--- a/main/auth/profile.php
+++ b/main/auth/profile.php
@@ -8,9 +8,6 @@
 *
 * @package chamilo.auth
 */
-
-// Language files that should be included.
-$language_file = array('registration');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 
@@ -192,7 +189,7 @@ if (is_profile_editable() && api_get_setting('openid_authentication') == 'true')
 }
 
 //    PHONE
-$form->addElement('text', 'phone', get_lang('phone'), array('size' => 20));
+$form->addElement('text', 'phone', get_lang('Phone'), array('size' => 20));
 if (api_get_setting('profile', 'phone') !== 'true') {
     $form->freeze('phone');
 }
diff --git a/main/course_info/infocours.php b/main/course_info/infocours.php
index 82d4838fa0..2632e58390 100755
--- a/main/course_info/infocours.php
+++ b/main/course_info/infocours.php
@@ -15,7 +15,7 @@
  */
 
 // Language files that need to be included
-$language_file = array('create_course', 'admin', 'gradebook', 'document');
+$language_file = array('admin', 'gradebook', 'document');
 require_once '../inc/global.inc.php';
 $current_course_tool  = TOOL_COURSE_SETTING;
 $this_section = SECTION_COURSES;
diff --git a/main/course_info/legal.php b/main/course_info/legal.php
index 7946e89f08..1119c751a7 100755
--- a/main/course_info/legal.php
+++ b/main/course_info/legal.php
@@ -4,7 +4,7 @@
 use \ChamiloSession as Session;
 
 // Language files that need to be included
-$language_file = array('create_course', 'admin');
+$language_file = array('admin');
 
 $cidReset = true;
 
diff --git a/main/course_info/maintenance.php b/main/course_info/maintenance.php
index cf8715cc57..848cca386a 100755
--- a/main/course_info/maintenance.php
+++ b/main/course_info/maintenance.php
@@ -9,7 +9,7 @@
  */
 
 // Language files that need to be included
-$language_file = array('admin','create_course');
+$language_file = array('admin');
 require_once '../inc/global.inc.php';
 $current_course_tool  = TOOL_COURSE_MAINTENANCE;
 $this_section = SECTION_COURSES;
diff --git a/main/course_info/maintenance_coach.php b/main/course_info/maintenance_coach.php
index 79bf9317bb..782f7ea77f 100644
--- a/main/course_info/maintenance_coach.php
+++ b/main/course_info/maintenance_coach.php
@@ -10,7 +10,7 @@
  * Code
  */
 // Language files that need to be included
-$language_file = array('admin', 'create_course');
+$language_file = array('admin');
 
 require_once '../inc/global.inc.php';
 
diff --git a/main/course_info/start.php b/main/course_info/start.php
index b31eaaf194..32547bf61d 100644
--- a/main/course_info/start.php
+++ b/main/course_info/start.php
@@ -3,7 +3,7 @@
 
 use \ChamiloSession as Session;
 
-$language_file = array('create_course', 'registration', 'admin', 'exercice');
+$language_file = array('admin', 'exercice');
 
 require_once '../inc/global.inc.php';
 
diff --git a/main/create_course/add_course.php b/main/create_course/add_course.php
index 7ca0471561..8ddb211899 100755
--- a/main/create_course/add_course.php
+++ b/main/create_course/add_course.php
@@ -14,7 +14,7 @@
 use \ChamiloSession as Session;
 
 // Name of the language file that needs to be included.
-$language_file = array('create_course', 'registration', 'admin', 'exercice');
+$language_file = array('admin', 'exercice');
 
 // Flag forcing the "current course" reset.
 $cidReset = true;
diff --git a/main/cron/lang/langstats.php b/main/cron/lang/langstats.php
index 14b8f3eeb8..f1f2632458 100755
--- a/main/cron/lang/langstats.php
+++ b/main/cron/lang/langstats.php
@@ -13,12 +13,12 @@
  */
 die();
 $language_file = array(
-'gradebook', 'registration', 'admin',
+'gradebook', 'admin',
 'help', 'reservation', 'hotspot',
 'scormdocument',
 'install', 'shibboleth',
 'learnpath', 'survey',
-'tracking', 'create_course',
+'tracking',
 'trad4all', 'document',
 'exercice', 'wiki',
 );
diff --git a/main/cron/lang/langstats_file_builder.php b/main/cron/lang/langstats_file_builder.php
index 7c13316070..f9177035c9 100755
--- a/main/cron/lang/langstats_file_builder.php
+++ b/main/cron/lang/langstats_file_builder.php
@@ -14,7 +14,6 @@
  */
 $language_file = array(
 'admin',
-'create_course',
 'document',
 'exercice',
 'gradebook',
@@ -22,7 +21,6 @@ $language_file = array(
 'hotspot',
 'install',
 'learnpath',
-'registration',
 'reservation',
 'scormdocument',
 'shibboleth',
diff --git a/main/cron/user_import/resend_email_with_new_password.php b/main/cron/user_import/resend_email_with_new_password.php
index 964091ae45..169bc17d9a 100755
--- a/main/cron/user_import/resend_email_with_new_password.php
+++ b/main/cron/user_import/resend_email_with_new_password.php
@@ -20,7 +20,7 @@
 die();
 //change filename depending on file containing mails list, with one e-mail per line.
 $list = file('input.txt');
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 require_once '../../inc/global.inc.php';
 $users = Database::get_main_table(TABLE_MAIN_USER);
 /**
diff --git a/main/document/document.php b/main/document/document.php
index 8a7b1f98c6..a658602069 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -29,7 +29,7 @@
 
 use \ChamiloSession as Session;
 // Language files that need to be included
-$language_file = array('document', 'gradebook', 'create_course');
+$language_file = array('document', 'gradebook');
 require_once '../inc/global.inc.php';
 $current_course_tool = TOOL_DOCUMENT;
 $this_section = SECTION_COURSES;
diff --git a/main/document/document_lite.php b/main/document/document_lite.php
index 1534e6abb5..a6ab7b2b7c 100755
--- a/main/document/document_lite.php
+++ b/main/document/document_lite.php
@@ -12,7 +12,7 @@ exit;
 
 
 // Language files that need to be included
-$language_file = array('document', 'gradebook', 'create_course');
+$language_file = array('document', 'gradebook');
 
 require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;
diff --git a/main/group/import.php b/main/group/import.php
index 4600d58039..85bbe1525e 100755
--- a/main/group/import.php
+++ b/main/group/import.php
@@ -2,7 +2,7 @@
 /* For licensing terms, see /license.txt */
 
 // Name of the language file that needs to be included
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 
 require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;
diff --git a/main/inc/ajax/extra_field.ajax.php b/main/inc/ajax/extra_field.ajax.php
index 70639a2d0b..dba16d1b2a 100755
--- a/main/inc/ajax/extra_field.ajax.php
+++ b/main/inc/ajax/extra_field.ajax.php
@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 require_once '../global.inc.php';
 $action = $_GET['a'];
 
diff --git a/main/inc/ajax/user_manager.ajax.php b/main/inc/ajax/user_manager.ajax.php
index 78e390b167..6925be3007 100755
--- a/main/inc/ajax/user_manager.ajax.php
+++ b/main/inc/ajax/user_manager.ajax.php
@@ -3,7 +3,7 @@
 /**
  * Responses to AJAX calls
  */
-$language_file = array('admin', 'registration';
+$language_file = array('admin');
 require_once '../global.inc.php';
 $action = $_GET['a'];
 
diff --git a/main/inc/course_document.inc.php b/main/inc/course_document.inc.php
index b8d2f8a996..59cade7c69 100755
--- a/main/inc/course_document.inc.php
+++ b/main/inc/course_document.inc.php
@@ -3,7 +3,7 @@
 
 /*		INIT SECTION */
 
-$language_file = array('create_course', 'document');
+$language_file = array('document');
 require 'global.inc.php';
 
 /*	Libraries */
diff --git a/main/inc/email_editor.php b/main/inc/email_editor.php
index afd6a03afa..698c64745e 100755
--- a/main/inc/email_editor.php
+++ b/main/inc/email_editor.php
@@ -13,7 +13,7 @@
 
 use \ChamiloSession as Session;
 
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 
 require_once '../inc/global.inc.php';
 
diff --git a/main/messages/inbox.php b/main/messages/inbox.php
index 8c7d01eacb..74ba0fc787 100755
--- a/main/messages/inbox.php
+++ b/main/messages/inbox.php
@@ -3,9 +3,6 @@
 /**
  * 	@package chamilo.messages
  */
-
-// name of the language file that needs to be included
-$language_file = array('registration');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/messages/outbox.php b/main/messages/outbox.php
index d45830d6d5..7166aba7b4 100755
--- a/main/messages/outbox.php
+++ b/main/messages/outbox.php
@@ -3,9 +3,6 @@
 /**
 *	@package chamilo.messages
 */
-
-// name of the language file that needs to be included
-$language_file = array('registration');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 
diff --git a/main/messages/view_message.php b/main/messages/view_message.php
index cc8693cbe1..dfe34606c0 100755
--- a/main/messages/view_message.php
+++ b/main/messages/view_message.php
@@ -3,7 +3,6 @@
 /**
 *	@package chamilo.messages
 */
-$language_file = array('registration');
 $cidReset= true;
 require_once '../inc/global.inc.php';
 api_block_anonymous_users();
diff --git a/main/mySpace/access_details.php b/main/mySpace/access_details.php
index fcbc432b14..507347beac 100755
--- a/main/mySpace/access_details.php
+++ b/main/mySpace/access_details.php
@@ -16,7 +16,7 @@
  * Code
  */
 // name of the language file that needs to be included
-$language_file = array ('registration', 'tracking');
+$language_file = array('tracking');
 
 require_once '../inc/global.inc.php';
 
diff --git a/main/mySpace/admin.php b/main/mySpace/admin.php
index fdba320e9c..5be669d91d 100755
--- a/main/mySpace/admin.php
+++ b/main/mySpace/admin.php
@@ -10,7 +10,7 @@
 ob_start();
 
 // name of the language file that needs to be included
-$language_file = array('registration', 'trad4all', 'tracking');
+$language_file = array('trad4all', 'tracking');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/mySpace/admin_view.php b/main/mySpace/admin_view.php
index 4fb1bc1b7f..8ef0eeb4eb 100644
--- a/main/mySpace/admin_view.php
+++ b/main/mySpace/admin_view.php
@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-$language_file = array('registration', 'tracking', 'admin', 'exercice');
+$language_file = array('tracking', 'admin', 'exercice');
 
 $cidReset = true;
 
diff --git a/main/mySpace/coaches.php b/main/mySpace/coaches.php
index 2633214eff..ca39ffb310 100755
--- a/main/mySpace/coaches.php
+++ b/main/mySpace/coaches.php
@@ -10,7 +10,7 @@
 ob_start();
 
 // name of the language file that needs to be included
-$language_file = array ('registration', 'tracking', 'admin');
+$language_file = array('tracking', 'admin');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/mySpace/course.php b/main/mySpace/course.php
index b0649e9ccf..58e7d313f0 100755
--- a/main/mySpace/course.php
+++ b/main/mySpace/course.php
@@ -10,7 +10,7 @@
 ob_start();
 $nameTools = 'Cours';
 // name of the language file that needs to be included
-$language_file = array('admin', 'registration', 'tracking');
+$language_file = array('admin', 'tracking');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/mySpace/current_courses.php b/main/mySpace/current_courses.php
index 1668fb1e5f..39a9d6e06d 100755
--- a/main/mySpace/current_courses.php
+++ b/main/mySpace/current_courses.php
@@ -7,7 +7,7 @@
 /**
  * Code
  */
-$language_file = array ('registration', 'tracking', 'exercice','admin');
+$language_file = array ('tracking', 'exercice','admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 $this_section = SECTION_TRACKING;
diff --git a/main/mySpace/index.php b/main/mySpace/index.php
index 396bc803bf..ebf7650ca4 100755
--- a/main/mySpace/index.php
+++ b/main/mySpace/index.php
@@ -6,7 +6,7 @@
  * @package chamilo.reporting
  */
 
-$language_file = array('registration', 'tracking', 'admin', 'exercice', 'gradebook');
+$language_file = array('tracking', 'admin', 'exercice', 'gradebook');
 
 // resetting the course id
 $cidReset = true;
diff --git a/main/mySpace/progression.php b/main/mySpace/progression.php
index a595e5aeda..69dee84970 100755
--- a/main/mySpace/progression.php
+++ b/main/mySpace/progression.php
@@ -10,7 +10,7 @@
  */
 // TODO: This file seems to be unfinished and unused.
 
-$language_file = array ('registration', 'tracking');
+$language_file = array('tracking');
 
 require_once '../inc/global.inc.php';
 
diff --git a/main/mySpace/reussite.php b/main/mySpace/reussite.php
index 27726dcf8a..a2e649a00b 100755
--- a/main/mySpace/reussite.php
+++ b/main/mySpace/reussite.php
@@ -11,7 +11,7 @@
 
 $nameTools = 'Reussite';
 // name of the language file that needs to be included
-$language_file = array ('registration', 'trad4all', 'tracking');
+$language_file = array ('trad4all', 'tracking');
 $cidReset = true;
 
 require '../inc/global.inc.php';
diff --git a/main/mySpace/session.php b/main/mySpace/session.php
index 47492500e5..b0cfaf5b4d 100755
--- a/main/mySpace/session.php
+++ b/main/mySpace/session.php
@@ -6,7 +6,7 @@
  */
 ob_start();
 // name of the language file that needs to be included
-$language_file = array('registration', 'trad4all', 'tracking', 'admin');
+$language_file = array('trad4all', 'tracking', 'admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
diff --git a/main/mySpace/student.php b/main/mySpace/student.php
index afc66c1648..14d9be59c6 100755
--- a/main/mySpace/student.php
+++ b/main/mySpace/student.php
@@ -6,7 +6,7 @@
  */
 
  // name of the language file that needs to be included
-$language_file = array ('registration', 'tracking', 'admin');
+$language_file = array ('tracking', 'admin');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/mySpace/teachers.php b/main/mySpace/teachers.php
index 03ba1dcc53..aaa8ba6e8d 100755
--- a/main/mySpace/teachers.php
+++ b/main/mySpace/teachers.php
@@ -8,7 +8,7 @@
  * Code
  */
 // name of the language file that needs to be included
-$language_file = array ('registration', 'tracking', 'admin');
+$language_file = array ('tracking', 'admin');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/mySpace/user_add.php b/main/mySpace/user_add.php
index e56fb2d104..c9f6a78427 100755
--- a/main/mySpace/user_add.php
+++ b/main/mySpace/user_add.php
@@ -8,7 +8,7 @@
  * Code
  */
 // name of the language file that needs to be included
-$language_file = array('admin', 'registration');
+$language_file = array('admin');
 $cidReset = true;
 
 exit; //@deprecated file seems to be unused
diff --git a/main/mySpace/user_import.php b/main/mySpace/user_import.php
index f19f510604..b4cb7d0285 100755
--- a/main/mySpace/user_import.php
+++ b/main/mySpace/user_import.php
@@ -9,7 +9,7 @@
 /**
  * Main script
  */
-$language_file = array ('admin', 'registration', 'trad4all', 'tracking');
+$language_file = array ('admin', 'trad4all', 'tracking');
 
 $cidReset = true;
 require_once '../inc/global.inc.php';
diff --git a/main/mySpace/users.php b/main/mySpace/users.php
index e5737a3504..635d87a285 100755
--- a/main/mySpace/users.php
+++ b/main/mySpace/users.php
@@ -8,7 +8,7 @@
  * Code
  */
  // name of the language file that needs to be included
-$language_file = array ('registration', 'tracking', 'admin');
+$language_file = array ('tracking', 'admin');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/social/message_for_group_form.inc.php b/main/social/message_for_group_form.inc.php
index ef5816d44d..f5d94f488c 100755
--- a/main/social/message_for_group_form.inc.php
+++ b/main/social/message_for_group_form.inc.php
@@ -5,8 +5,7 @@
  * Form for group message
  * @package chamilo.social
  */
-
-$language_file = array('registration', 'admin');
+$language_file = array('admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 
diff --git a/main/social/profile_friends_and_groups.inc.php b/main/social/profile_friends_and_groups.inc.php
index 0f1179d33c..17254aa35c 100755
--- a/main/social/profile_friends_and_groups.inc.php
+++ b/main/social/profile_friends_and_groups.inc.php
@@ -8,7 +8,7 @@
 /**
  * Initialization
  */
-$language_file = array('registration', 'admin');
+$language_file = array('admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 
diff --git a/main/social/search.php b/main/social/search.php
index e5704d086b..13603726a0 100755
--- a/main/social/search.php
+++ b/main/social/search.php
@@ -6,7 +6,7 @@
  */
 
 // name of the language file that needs to be included
-$language_file = array('registration', 'admin');
+$language_file = array('admin');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
diff --git a/main/survey/fillsurvey.php b/main/survey/fillsurvey.php
index 48b9e41778..da64cfb5fe 100755
--- a/main/survey/fillsurvey.php
+++ b/main/survey/fillsurvey.php
@@ -470,7 +470,7 @@ if ($survey_data['form_fields'] != '' && $survey_data['anonymous'] == 0 && is_ar
 
     if ($list['phone'] == 1) {
         //    PHONE
-        $form->addElement('text', 'phone', get_lang('phone'), array('size' => 20));
+        $form->addElement('text', 'phone', get_lang('Phone'), array('size' => 20));
         if (api_get_setting('profile', 'phone') !== 'true') {
             $form->freeze('phone');
         }
diff --git a/main/timeline/index.php b/main/timeline/index.php
index ce66f64eae..39b7da1f4c 100755
--- a/main/timeline/index.php
+++ b/main/timeline/index.php
@@ -8,7 +8,7 @@
  * Init
  */
 // name of the language file that needs to be included
-$language_file = array ('registration','admin');
+$language_file = array('admin');
 require_once '../inc/global.inc.php';
 
 require_once api_get_path(LIBRARY_PATH).'timeline.lib.php';  
diff --git a/main/timeline/view.php b/main/timeline/view.php
index 3a60d28ccb..e9a1c1aa3a 100755
--- a/main/timeline/view.php
+++ b/main/timeline/view.php
@@ -6,7 +6,7 @@
 */
 
 // name of the language file that needs to be included
-$language_file = array ('registration','admin');
+$language_file = array ('admin');
 require_once '../inc/global.inc.php';
 
 require_once api_get_path(LIBRARY_PATH).'timeline.lib.php';  
diff --git a/main/tracking/course_session_report.php b/main/tracking/course_session_report.php
index b20d3aef23..ce33fa04af 100755
--- a/main/tracking/course_session_report.php
+++ b/main/tracking/course_session_report.php
@@ -6,7 +6,7 @@
  * @package chamilo.tracking
  */
 
-$language_file = array ('registration', 'index', 'tracking', 'exercice','survey');
+$language_file = array ('tracking', 'exercice','survey');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'pear/Spreadsheet_Excel_Writer/Writer.php';
diff --git a/main/tracking/exams.php b/main/tracking/exams.php
index 8db8131e18..9c7843f7ae 100755
--- a/main/tracking/exams.php
+++ b/main/tracking/exams.php
@@ -8,7 +8,7 @@
  * Code
  */
 
-$language_file = array('registration', 'tracking', 'exercice','survey');
+$language_file = array('tracking', 'exercice','survey');
 require_once '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'pear/Spreadsheet_Excel_Writer/Writer.php';
 
diff --git a/main/tracking/lp_results_by_user.php b/main/tracking/lp_results_by_user.php
index 8c8ca40f42..d8aafe21b2 100755
--- a/main/tracking/lp_results_by_user.php
+++ b/main/tracking/lp_results_by_user.php
@@ -11,7 +11,7 @@
  * Code
  */
 
-$language_file = array ('registration', 'tracking', 'exercice','survey');
+$language_file = array ('tracking', 'exercice','survey');
 
 require_once '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
diff --git a/main/tracking/question_course_report.php b/main/tracking/question_course_report.php
index 267f526cc3..e56ac8656d 100755
--- a/main/tracking/question_course_report.php
+++ b/main/tracking/question_course_report.php
@@ -6,7 +6,7 @@
  * @package chamilo.tracking
  */
 
-$language_file = array('registration', 'tracking', 'exercice','survey');
+$language_file = array('tracking', 'exercice', 'survey');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 
diff --git a/main/user/add_users_to_session.php b/main/user/add_users_to_session.php
index e124863b81..b7d0d413f3 100755
--- a/main/user/add_users_to_session.php
+++ b/main/user/add_users_to_session.php
@@ -5,7 +5,7 @@
 */
 
 // name of the language file that needs to be included
-$language_file = array('admin','registration');
+$language_file = array('admin');
 
 // resetting the course id
 $cidReset = true;
diff --git a/main/user/class.php b/main/user/class.php
index 01753df914..932b7eb8e0 100755
--- a/main/user/class.php
+++ b/main/user/class.php
@@ -7,7 +7,7 @@
  * INIT SECTION
  */
 // name of the language file that needs to be included
-$language_file = array('registration','admin');
+$language_file = array('admin');
 require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;
 
diff --git a/main/user/subscribe_class.php b/main/user/subscribe_class.php
index ad21d25b23..da9d8ec779 100755
--- a/main/user/subscribe_class.php
+++ b/main/user/subscribe_class.php
@@ -8,7 +8,7 @@
  * Code
  */
 // name of the language file that needs to be included
-$language_file = array('registration', 'admin');
+$language_file = array('admin');
 include ('../inc/global.inc.php');
 $this_section = SECTION_COURSES;
 
diff --git a/main/user/subscribe_user.php b/main/user/subscribe_user.php
index 9522d5158e..f0719d9066 100755
--- a/main/user/subscribe_user.php
+++ b/main/user/subscribe_user.php
@@ -7,7 +7,7 @@
 */
 
 // name of the language file that needs to be included
-$language_file = array('registration','admin');
+$language_file = array('admin');
 require_once '../inc/global.inc.php';
 $current_course_tool  = TOOL_USER;
 
diff --git a/main/user/user.php b/main/user/user.php
index 7b5183293f..0151714c16 100755
--- a/main/user/user.php
+++ b/main/user/user.php
@@ -24,7 +24,7 @@
  * Code
  */
 // name of the language file that needs to be included
-$language_file = array('registration', 'admin');
+$language_file = array('admin');
 $use_anonymous = true;
 require_once '../inc/global.inc.php';
 $current_course_tool  = TOOL_USER;
diff --git a/main/user/userInfo.php b/main/user/userInfo.php
index a9083171d2..d2e5c9edaf 100755
--- a/main/user/userInfo.php
+++ b/main/user/userInfo.php
@@ -15,10 +15,6 @@
  *  @todo clean this code
  *	@package chamilo.user
  */
-
-// name of the language file that needs to be included
-$language_file = array ('registration');
-
 require_once '../inc/global.inc.php';
 
 $htmlHeadXtra[] = '<script type="text/javascript">
diff --git a/main/user/user_add.php b/main/user/user_add.php
index badb4a7073..f00c2af9d8 100755
--- a/main/user/user_add.php
+++ b/main/user/user_add.php
@@ -8,10 +8,6 @@
  */
 
 /* INIT */
-
-// name of the language file that needs to be included
-$language_file="registration";
-
 include("../inc/global.inc.php");
 $this_section=SECTION_COURSES;
 
diff --git a/main/user/user_import.php b/main/user/user_import.php
index 623fde7f53..e9d7f2196b 100755
--- a/main/user/user_import.php
+++ b/main/user/user_import.php
@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-$language_file = array('registration', 'admin');
+$language_file = array('admin');
 
 require_once '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'import.lib.php';
diff --git a/plugin/buycourses/src/inscription.php b/plugin/buycourses/src/inscription.php
index 7ab16ceef0..8d0fb6aa5a 100644
--- a/plugin/buycourses/src/inscription.php
+++ b/plugin/buycourses/src/inscription.php
@@ -9,7 +9,7 @@
  */
 use ChamiloSession as Session;
 
-$language_file = array('registration', 'admin');
+$language_file = array('admin');
 
 if (!empty($_POST['language'])) { //quick hack to adapt the registration form result to the selected registration language
     $_GET['language'] = $_POST['language'];
diff --git a/plugin/ticket/src/course_user_list.php b/plugin/ticket/src/course_user_list.php
index 4b4b2eca4e..f73af1572f 100755
--- a/plugin/ticket/src/course_user_list.php
+++ b/plugin/ticket/src/course_user_list.php
@@ -7,7 +7,6 @@
 /**
  * Init section
  */
-$language_file = array('registration');
 require_once '../config.php';
 $plugin = TicketPlugin::create();
 
diff --git a/plugin/ticket/src/ticket_assign_log.php b/plugin/ticket/src/ticket_assign_log.php
index 5921c76a10..fe01de8a23 100755
--- a/plugin/ticket/src/ticket_assign_log.php
+++ b/plugin/ticket/src/ticket_assign_log.php
@@ -4,7 +4,6 @@
 /**
  * @package chamilo.plugin.ticket
  */
-$language_file = array('registration');
 require_once '../config.php';
 $plugin = TicketPlugin::create();
 
diff --git a/user.php b/user.php
index 93a5d9fc98..a7d3ceb80a 100755
--- a/user.php
+++ b/user.php
@@ -15,9 +15,6 @@
 /**
  * Variables definitions and inclusions
  */
-// name of the language file that needs to be included
-$language_file = array('registration');
-
 $cidReset = true;
 require_once 'main/inc/global.inc.php';
 
diff --git a/whoisonline.php b/whoisonline.php
index 65819f076a..78a1eda80d 100755
--- a/whoisonline.php
+++ b/whoisonline.php
@@ -4,18 +4,14 @@
 /**
 * Who is online list
 */
-
-// language files that should be included
-$language_file = array('registration');
-
 if (!isset($_GET['cidReq'])) {
-	$cidReset = true;
+    $cidReset = true;
 }
 
 // including necessary files
 require_once './main/inc/global.inc.php';
 
-if (isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0 ) {
+if (isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
     api_protect_course_script(true);
 }
 
@@ -37,24 +33,24 @@ function show_image(image,width,height) {
 }
 
 $(document).ready(function (){
-	$("input#id_btn_send_invitation").bind("click", function(){
-		if (confirm("'.get_lang('SendMessageInvitation', '').'")) {
-			$("#form_register_friend").submit();
-		}
-	});
+    $("input#id_btn_send_invitation").bind("click", function(){
+        if (confirm("'.get_lang('SendMessageInvitation', '').'")) {
+            $("#form_register_friend").submit();
+        }
+    });
 });
 
 function display_hide () {
-		setTimeout("hide_display_message()",3000);
+    setTimeout("hide_display_message()",3000);
 }
 function hide_display_message () {
-	$("div#display_response_id").html("");
-	try {
-		$("#txt_subject_id").val("");
-		$("#txt_area_invite").val("");
-	}catch(e) {
-		$("#txt_area_invite").val("");
-	}
+    $("div#display_response_id").html("");
+    try {
+        $("#txt_subject_id").val("");
+        $("#txt_area_invite").val("");
+    }catch(e) {
+        $("#txt_area_invite").val("");
+    }
 }
 
 function show_icon_edit(element_html) {
@@ -111,7 +107,7 @@ if ($_GET['chatid'] != '') {
 // This if statement prevents users accessing the who's online feature when it has been disabled.
 if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) || ((api_get_setting('showonline', 'users') == 'true' || api_get_setting('showonline', 'course') == 'true') && $_user['user_id'])) {
 
-    if(isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0 ) {
+    if (isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
         $user_list = who_is_online_in_this_course(0, 9, api_get_user_id(), api_get_setting('time_limit_whosonline'), $_GET['cidReq']);
     } else {
         $user_list = who_is_online(0, 9);