diff --git a/modules/Users/models/Record.php b/modules/Users/models/Record.php
index 56cfb7a67da24d65d85dc5074e60ad503ff3dc6d..b2996ec79343aefe7e2d03c11521e6ea21f66b99 100644
--- a/modules/Users/models/Record.php
+++ b/modules/Users/models/Record.php
@@ -399,13 +399,16 @@ class Users_Record_Model extends Vtiger_Record_Model {
 
 			//decode_html - added to handle UTF-8 characters in file names
 			$imageOriginalName = urlencode(decode_html($imageName));
+            if($url) {
+                $url = $site_URL.$url;
+            }
 
 			$imageDetails[] = array(
 					'id' => $imageId,
 					'orgname' => $imageOriginalName,
 					'path' => $imagePath.$imageId,
 					'name' => $imageName,
-                    'url'  => $site_URL.$url
+                    'url'  => $url
 			);
 		}
 		return $imageDetails;
diff --git a/modules/Vtiger/models/Record.php b/modules/Vtiger/models/Record.php
index c6d9a683f1242d36afbde66365623087ea41629d..f67c7b1b15163f31768378973b800a00edc43d17 100644
--- a/modules/Vtiger/models/Record.php
+++ b/modules/Vtiger/models/Record.php
@@ -416,14 +416,17 @@ class Vtiger_Record_Model extends Vtiger_Base_Model {
             $url = \Vtiger_Functions::getFilePublicURL($imageId, $imageName);
 			//decode_html - added to handle UTF-8 characters in file names
 			$imageOriginalName = urlencode(decode_html($imageName));
-
+            if($url) {
+                $url = $site_URL.$url;
+            }
+            
 			if(!empty($imageName)){
 				$imageDetails[] = array(
 						'id' => $imageId,
 						'orgname' => $imageOriginalName,
 						'path' => $imagePath.$imageId,
 						'name' => $imageName,
-                        'url'  => $site_URL.$url
+                        'url'  => $url
 				);
 			}
 		}