diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index ce3b8e49f7..14fa6d5699 100644
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -69,17 +69,6 @@ if ($get_module_detail) {
 	
 	ui_include_time_picker();
 	
-	ui_require_jquery_file("ui.datepicker-" . get_user_language(),
-		"include/javascript/i18n/");
-	
-	ui_require_jquery_file ("ui-timepicker-addon");
-	// This script is included manually to be included after jquery and avoid error
-	echo '<script type="text/javascript" src="' .
-		ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' .
-		get_user_language(), false, false, false) . '"></script>';
-	ui_require_jquery_file("ui.datepicker-" . get_user_language(),
-		"include/javascript/i18n/");
-	
 	$module_id = get_parameter ('id_module');
 	$period = get_parameter ("period", 86400);
 	$group = agents_get_agentmodule_group ($module_id);
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 6dffc006ad..da2bf5e096 100644
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3472,10 +3472,18 @@ function ui_get_error ($error_code) {
 }
 
 function ui_include_time_picker() {
-	ui_require_jquery_file ("ui-timepicker-addon");
+	if (is_ajax ()) {
+		echo '<script type="text/javascript" src="' .
+			ui_get_full_url(false, false, false, false) .
+			'include/javascript/jquery.ui-timepicker-addon.js' . '"></script>';
+	}
+	else {
+		ui_require_jquery_file ("ui-timepicker-addon");
+	}
 	
 	if (file_exists('include/javascript/i18n/jquery-ui-timepicker-' . substr(get_user_language(), 0, 2) . '.js')) {
-		echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . substr(get_user_language(), 0, 2) . '.js', false, false, false) . '"></script>';
+		echo '<script type="text/javascript" src="' .
+			ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . substr(get_user_language(), 0, 2) . '.js', false, false, false) . '"></script>';
 	}
 }
 ?>