diff --git a/InstructorsAndTrainees/commonview.h b/InstructorsAndTrainees/commonview.h
index 123cdb4..0f7755c 100644
--- a/InstructorsAndTrainees/commonview.h
+++ b/InstructorsAndTrainees/commonview.h
@@ -38,6 +38,7 @@ public:
     void clearTree()
     {
         treeWidget->clear();
+        lastCurrentID = 0;
     }
 
 protected:
diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.h b/InstructorsAndTrainees/tasks/ammtaskswidget.h
index 1bf1f7e..6d91e35 100644
--- a/InstructorsAndTrainees/tasks/ammtaskswidget.h
+++ b/InstructorsAndTrainees/tasks/ammtaskswidget.h
@@ -32,6 +32,8 @@ public:
     void clearTree()
     {
         treeWidget->clear();
+        loginTraineeSelected = "";
+        idTraineeSelected = 0;
     }
 
 public:
diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.h b/InstructorsAndTrainees/tasks/fimtaskswidget.h
index e9b90d5..bcc426d 100644
--- a/InstructorsAndTrainees/tasks/fimtaskswidget.h
+++ b/InstructorsAndTrainees/tasks/fimtaskswidget.h
@@ -35,6 +35,8 @@ public:
     void clearTree()
     {
         treeWidget->clear();
+        loginTraineeSelected = "";
+        idTraineeSelected = 0;
     }
 
 public:
diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp
index 83bebea..042d6bf 100644
--- a/InstructorsAndTrainees/trainees/viewertrainees.cpp
+++ b/InstructorsAndTrainees/trainees/viewertrainees.cpp
@@ -117,10 +117,10 @@ void ViewerTrainees::on_treeWidget_currentItemChanged(QTreeWidgetItem *current,
     if(current == nullptr)
         return;
 
-    if(current->childCount() == 0)
+    //if(current->childCount() == 0)
     {//Выбран обучаемый
         QString login = current->text(ColumnsTreeTrainees::clmn_Login);
-        if(login != "")
+        //if(login != "")
         {
             int newCurrentID = connectorToServer->getIdTraineeByLogin(login);
 
diff --git a/InstructorsAndTrainees/trainees/viewertrainees.h b/InstructorsAndTrainees/trainees/viewertrainees.h
index e3be26a..638843d 100644
--- a/InstructorsAndTrainees/trainees/viewertrainees.h
+++ b/InstructorsAndTrainees/trainees/viewertrainees.h
@@ -22,6 +22,13 @@ public:
 public:
     void setAuthComplited(bool authComplited);
 
+    void clearTree()
+    {
+        CommonView::clearTree();
+        ammTasksWidget->clearTree();
+        fimTasksWidget->clearTree();
+    }
+
 protected:
     void changeEvent(QEvent * event) override;