diff --git a/main/inc/lib/extra_field.lib.php b/main/inc/lib/extra_field.lib.php
index cae76fb7a4..47b3e41a3b 100755
--- a/main/inc/lib/extra_field.lib.php
+++ b/main/inc/lib/extra_field.lib.php
@@ -1075,6 +1075,16 @@ class ExtraField extends Model
                     $form->addHtml($introductionTextList[$field_details['variable']]);
                 }
 
+                $freezeElement = false;
+                if (!$admin_permissions) {
+                    $freezeElement = $field_details['visible_to_self'] == 0 || $field_details['changeable'] == 0;
+                }
+
+                $translatedDisplayText = get_lang($field_details['display_text'], true);
+                if (!empty($translatedDisplayText)) {
+                    $field_details['display_text'] = $translatedDisplayText;
+                }
+
                 switch ($field_details['field_type']) {
                     case self::FIELD_TYPE_TEXT:
                         $form->addElement(
diff --git a/user_portal.php b/user_portal.php
index 437a1d6b1f..a242d2badb 100755
--- a/user_portal.php
+++ b/user_portal.php
@@ -319,7 +319,7 @@ if (api_is_drh() || api_is_student_boss()) {
 }
 $block = '';
 if (!empty($diagnosis)) {
-    $block .= $controller->show_right_block(
+    $block .= $controller->showRightBlock(
         get_lang('Diagnostic'),
         '<ul class="list-group"><li class="list-group-item">'.$diagnosis.'</li></ul>',
         'diagnosis_block',
@@ -332,12 +332,13 @@ if (!empty($diagnosis)) {
 $controller->tpl->assign('diagnosis_block', $block);
 $controller->tpl->assign('profile_block', $controller->return_profile_block());
 $controller->tpl->assign('user_image_block', $controller->return_user_image_block());
-$controller->tpl->assign('course_block', $controller->return_course_block());
-$controller->tpl->assign('navigation_course_links', $controller->return_navigation_links());
-$controller->tpl->assign('search_block', $controller->return_search_block());
-$controller->tpl->assign('notice_block', $controller->return_notice());
-$controller->tpl->assign('classes_block', $controller->returnClassesBlock());
-$controller->tpl->assign('skills_block', $controller->returnSkillLinks());
+// Ofaj
+//$controller->tpl->assign('course_block', $controller->return_course_block());
+//$controller->tpl->assign('navigation_course_links', $controller->return_navigation_links());
+//$controller->tpl->assign('search_block', $controller->return_search_block());
+//$controller->tpl->assign('notice_block', $controller->return_notice());
+//$controller->tpl->assign('classes_block', $controller->returnClassesBlock());
+//$controller->tpl->assign('skills_block', $controller->returnSkillLinks());
 
 $historyClass = '';
 if (!empty($_GET['history'])) {