diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php
index 1e87ef9f9073d58b62aba204f6ff4dd2f90c2f9a..1f707ab066dc4e03b72d94eaea0d07df9d1c7726 100644
--- a/interface/web/sites/tools.inc.php
+++ b/interface/web/sites/tools.inc.php
@@ -55,8 +55,9 @@ function replacePrefix($name, $dataRecord) {
 
 function getClientName($dataRecord) {
     global $app, $conf;
-
-    if($_SESSION["s"]["user"]["typ"] != 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+    /* FS#1234 - CLIENTNAME value when in reseller account - need check this workarround impact */
+    //if($_SESSION["s"]["user"]["typ"] != 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+    if($_SESSION["s"]["user"]["typ"] != 'admin' && ! $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
     	// Get the group-id of the user
     	$client_group_id = $_SESSION["s"]["user"]["default_group"];
     } else {