diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index 5501dcb00b..c293cf20e7 100755
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -878,7 +878,7 @@ class IndexManager
     /**
      * @return null|string|void
      */
-    public function return_profile_block()
+    public function return_profile_block($diagnosisComplete)
     {
         global $_configuration;
         $user_id = api_get_user_id();
@@ -969,13 +969,17 @@ class IndexManager
         }
 
         $diagnosis = '';
-
         if (api_is_drh() || api_is_student_boss()) {
             $diagnosis = Display::url(get_lang('DiagnosisManagement'), api_get_path(WEB_PATH).'load_search.php').'<br />';
             $diagnosis .= Display::url(get_lang('Diagnostic'), api_get_path(WEB_PATH).'search.php');
         } else {
             if (api_is_student()) {
-                $diagnosis = Display::url(get_lang('Diagnostic'), api_get_path(WEB_PATH).'search.php');
+                if ($diagnosisComplete === false) {
+                    $diagnosis = Display::url(
+                        get_lang('Diagnostic'),
+                        api_get_path(WEB_PATH).'search.php'
+                    );
+                }
             }
         }
 
@@ -1285,7 +1289,7 @@ class IndexManager
                                 'id' => $session_id
                             );
                             $session_box = Display::get_session_title_box($session_id);
-                           
+
                             $actions = null;
                             if (api_is_platform_admin()) {
                                 $actions = api_get_path(WEB_CODE_PATH) .'session/resume_session.php?id_session='.$session_id;
diff --git a/user_portal.php b/user_portal.php
index 0c8a01f814..e2afbd2e09 100755
--- a/user_portal.php
+++ b/user_portal.php
@@ -219,7 +219,20 @@ if (!empty($some_activex) || !empty($some_plugins)) {
     }
 }
 
-$controller->tpl->assign('profile_block', $controller->return_profile_block());
+$diagnosisComplete = true;
+if (api_is_student()) {
+    $extraFieldValue = new ExtraFieldValue('user');
+    $diagnosisComplete = $extraFieldValue->get_values_by_handler_and_field_variable(
+        api_get_user_id(),
+        'diagnosis_completed'
+    );
+
+    if ($diagnosisComplete === false) {
+        Display::addFlash(Display::return_message(get_lang('DoDiagnosisNow')));
+    }
+}
+
+$controller->tpl->assign('profile_block', $controller->return_profile_block($diagnosisComplete));
 $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());
@@ -233,18 +246,6 @@ if (!empty($_GET['history'])) {
     $historyClass = 'courses-history';
 }
 $controller->tpl->assign('course_history_page', $historyClass);
-
-if (api_is_student()) {
-    $extraFieldValue = new ExtraFieldValue('user');
-    $diagnosisComplete = $extraFieldValue->get_values_by_handler_and_field_variable(
-        api_get_user_id(),
-        'diagnosis_completed'
-    );
-
-    if ($diagnosisComplete === false) {
-        Display::addFlash(Display::return_message(get_lang('DoDiagnosisNow')));
-    }
-}
 $controller->tpl->display_two_col_template();
 
 // Deleting the session_id.