diff --git a/main/inc/lib/extra_field.lib.php b/main/inc/lib/extra_field.lib.php
index 487d671e97..26fdd02e15 100755
--- a/main/inc/lib/extra_field.lib.php
+++ b/main/inc/lib/extra_field.lib.php
@@ -1339,12 +1339,10 @@ EOF;
                         );
 
                         if (is_array($extraData) && array_key_exists($fieldVariable, $extraData)) {
-                            $cleanImagePath = str_replace(api_get_path(SYS_PATH), '', $extraData[$fieldVariable]);
-                            $webImagePath = api_get_path(WEB_PATH) . $cleanImagePath;
 
-                            if (file_exists(api_get_path(SYS_PATH) . $cleanImagePath)) {
+                            if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $extraData[$fieldVariable])) {
                                 $fieldTexts[] = Display::img(
-                                    $webImagePath,
+                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
                                     $field_details['display_text'],
                                     array('width' => '300')
                                 );
@@ -1406,13 +1404,10 @@ EOF;
                         if (is_array($extraData) &&
                             array_key_exists($fieldVariable, $extraData)
                         ) {
-                            $cleanFilePath = str_replace(api_get_path(SYS_PATH), '', $extraData[$fieldVariable]);
-                            $webFilePath = api_get_path(WEB_PATH) . $cleanFilePath;
-
-                            if (file_exists(api_get_path(SYS_PATH) . $cleanFilePath)) {
+                            if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $extraData[$fieldVariable])) {
                                 $fieldTexts[] = Display::url(
-                                    $webFilePath,
-                                    $webFilePath,
+                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
+                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
                                     array(
                                         'title' => $field_details['display_text'],
                                         'target' => '_blank'
diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
index 69d75ecce8..21323d17f0 100755
--- a/main/inc/lib/sessionmanager.lib.php
+++ b/main/inc/lib/sessionmanager.lib.php
@@ -6247,7 +6247,7 @@ class SessionManager
      *
      * @return array
      */
-    public static function setForm(FormValidator & $form)
+    public static function setForm(FormValidator & $form, $sessionId = 0)
     {
         $categoriesList = SessionManager::get_all_session_category();
         $userInfo = api_get_user_info();
@@ -6479,7 +6479,7 @@ class SessionManager
 
         // Extra fields
         $extra_field = new ExtraField('session');
-        $extra = $extra_field->addElements($form, null);
+        $extra = $extra_field->addElements($form, $sessionId);
 
         $form->addElement('html','</div>');
 
diff --git a/main/session/session_edit.php b/main/session/session_edit.php
index 6ca47f0cf3..3cbeeb6b88 100644
--- a/main/session/session_edit.php
+++ b/main/session/session_edit.php
@@ -87,7 +87,7 @@ $formAction .= http_build_query(array(
 
 $form = new FormValidator('edit_session', 'post', $formAction);
 $form->addElement('header', $tool_name);
-$result = SessionManager::setForm($form);
+$result = SessionManager::setForm($form, $id);
 
 $htmlHeadXtra[] = '
 <script>