diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php
index d0b7d2316..5d1aa082d 100755
--- a/workflow/engine/classes/model/Users.php
+++ b/workflow/engine/classes/model/Users.php
@@ -153,9 +153,9 @@ public function userExists($UsrUid)
                     $aFields['USR_LOCATION']
                 );
 
-                $aFields['USR_COUNTRY_NAME']  = (!empty($aIsoCountry['IC_NAME']))?     $aIsoCountry['IC_NAME'] : '';
-                $aFields['USR_CITY_NAME']     = (!empty($aIsoSubdivision['IS_NAME']))? $aIsoSubdivision['IS_NAME'] : '';
-                $aFields['USR_LOCATION_NAME'] = (!empty($aIsoLocation['IL_NAME']))?    $aIsoLocation['IL_NAME'] : '';
+                $aFields['USR_COUNTRY_NAME']  = $aIsoCountry['IC_NAME'];
+                $aFields['USR_CITY_NAME']     = $aIsoSubdivision['IS_NAME'];
+                $aFields['USR_LOCATION_NAME'] = $aIsoLocation['IL_NAME'];
 
                 $result = $aFields;
 
diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php
index 2005f3eab..5c6b0f71b 100644
--- a/workflow/engine/methods/users/usersAjax.php
+++ b/workflow/engine/methods/users/usersAjax.php
@@ -483,6 +483,10 @@ switch($_POST['action'])
 
     $aFields['CASES_MENUSELECTED_NAME'] = $casesMenuSelected;
 
+    $aFields['USR_COUNTRY_NAME']  = (!empty($aFields['USR_COUNTRY_NAME']))?  $aFields['USR_COUNTRY_NAME'] : '';
+    $aFields['USR_CITY_NAME']     = (!empty($aFields['USR_CITY_NAME']))?     $aFields['USR_CITY_NAME'] : '';
+    $aFields['USR_LOCATION_NAME'] = (!empty($aFields['USR_LOCATION_NAME']))? $aFields['USR_LOCATION_NAME'] : '';
+
     $result->success = true;
     $result->user    = $aFields;