diff --git a/modules/dashactivity/dashactivity.php b/modules/dashactivity/dashactivity.php
index 5282d60fd..123f9a5aa 100644
--- a/modules/dashactivity/dashactivity.php
+++ b/modules/dashactivity/dashactivity.php
@@ -54,6 +54,26 @@ class Dashactivity extends Module
 	
 	public function hookDashboardData($params)
 	{
+		$gapi = Module::isInstalled('gapi') ? Module::getInstanceByName('gapi') : false;
+		if (Validate::isLoadedObject($gapi))
+		{
+			$visits = $unique_visitors = 0;
+			if ($result = $gapi->requestReportData('', 'ga:visits,ga:visitors', $params['date_from'], $params['date_to'], null, null, 1, 1))
+			{
+				$visits = $result[0]['metrics']['visits'];
+				$unique_visitors = $result[0]['metrics']['visitors'];
+			}
+		}
+		else
+		{
+			$row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
+			SELECT COUNT(`id_connections`) as visits, COUNT(DISTINCT `id_guest`) as unique_visitors
+			FROM `'._DB_PREFIX_.'connections`
+			WHERE `date_add` BETWEEN "'.pSQL($params['date_from']).'" AND "'.pSQL($params['date_to']).'"
+			'.Shop::addSqlRestriction(false));
+			extract($row);
+		}
+		
 		$order_nbr = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
 		SELECT COUNT(o.`id_order`)
 		FROM `'._DB_PREFIX_.'orders` o
@@ -74,12 +94,12 @@ class Dashactivity extends Module
 				'online_visitor' => 200,
 				'new_registrations' => 125,
 				'total_suscribers' => 13500,
-				'visits' => 10000,
-				'unique_visitors' => 3500,
-				),
+				'visits' => $visits,
+				'unique_visitors' => $unique_visitors,
+			),
 			'data_trends' => array(
 				'orders_trends' => array('way' => 'down', 'value' => 0.42),
-				)
-			);
+			)
+		);
 	}
 }
\ No newline at end of file
diff --git a/modules/dashtrends/dashtrends.php b/modules/dashtrends/dashtrends.php
index ea2982f17..9f34b2a01 100644
--- a/modules/dashtrends/dashtrends.php
+++ b/modules/dashtrends/dashtrends.php
@@ -58,22 +58,22 @@ class Dashtrends extends Module
 		if (Validate::isLoadedObject($gapi))
 		{
 			$visits_score = 0;
-			if ($result = $gapi->requestReportData('', 'ga:visits', $this->context->employee->stats_date_from, $this->context->employee->stats_date_to, null, null, 1, 1))
+			if ($result = $gapi->requestReportData('', 'ga:visits', $params['date_from'], $params['date_to'], null, null, 1, 1))
 				$visits_score = $result[0]['metrics']['visits'];
 		}
 		else
 		{
 			$visits_score = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
-			SELECT COUNT(c.`id_connections`)
-			FROM `'._DB_PREFIX_.'connections` c
-			WHERE c.`date_add` BETWEEN "'.pSQL($params['date_from']).'" AND "'.pSQL($params['date_to']).'"
-			'.Shop::addSqlRestriction(false, 'c'));
+			SELECT COUNT(`id_connections`)
+			FROM `'._DB_PREFIX_.'connections`
+			WHERE `date_add` BETWEEN "'.pSQL($params['date_from']).'" AND "'.pSQL($params['date_to']).'"
+			'.Shop::addSqlRestriction(false));
 		}
 		$row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
-		SELECT COUNT(o.`id_order`) as orders_score, SUM(o.`total_paid_tax_excl` / o.conversion_rate) as sales_score
-		FROM `'._DB_PREFIX_.'orders` o
-		WHERE o.`invoice_date` BETWEEN "'.pSQL($params['date_from']).'" AND "'.pSQL($params['date_to']).'"
-		'.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o'));
+		SELECT COUNT(`id_order`) as orders_score, SUM(`total_paid_tax_excl` / `conversion_rate`) as sales_score
+		FROM `'._DB_PREFIX_.'orders`
+		WHERE `invoice_date` BETWEEN "'.pSQL($params['date_from']).'" AND "'.pSQL($params['date_to']).'"
+		'.Shop::addSqlRestriction(Shop::SHARE_ORDER));
 		extract($row);
 
 		return array(