diff --git a/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp b/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp
index 61d559d..9685c1b 100644
--- a/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp
+++ b/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp
@@ -13,6 +13,8 @@ DialogEditInstructor::DialogEditInstructor(QWidget *parent) :
     ui->editName->setProperty("mandatoryField", true);
     ui->editLogin->setProperty("mandatoryField", true);
     ui->editPassword->setProperty("mandatoryField", true);
+
+    ui->btnOK->setEnabled(false);
 }
 
 DialogEditInstructor::~DialogEditInstructor()
@@ -36,6 +38,8 @@ void DialogEditInstructor::setInstructor(Instructor instructor)
         ui->editName->setEnabled(false);
     else
         ui->editName->setEnabled(true);
+
+    ui->btnOK->setEnabled(false);
 }
 
 Instructor DialogEditInstructor::getInstructor()
diff --git a/InstructorsAndTrainees/trainees/dialogeditgroup.cpp b/InstructorsAndTrainees/trainees/dialogeditgroup.cpp
index b13fc8f..761fa90 100644
--- a/InstructorsAndTrainees/trainees/dialogeditgroup.cpp
+++ b/InstructorsAndTrainees/trainees/dialogeditgroup.cpp
@@ -23,6 +23,8 @@ void DialogEditGroup::setGroup(Group group)
     groupInput = group;
 
     ui->editName->setText(group.getName());
+
+    ui->btnOK->setEnabled(false);
 }
 
 Group DialogEditGroup::getGroup()
diff --git a/InstructorsAndTrainees/trainees/dialogedittrainee.cpp b/InstructorsAndTrainees/trainees/dialogedittrainee.cpp
index 1774b41..f9b2801 100644
--- a/InstructorsAndTrainees/trainees/dialogedittrainee.cpp
+++ b/InstructorsAndTrainees/trainees/dialogedittrainee.cpp
@@ -30,6 +30,8 @@ void DialogEditTrainee::setTrainee(Trainee trainee)
 
     ui->checkArchived->setChecked(trainee.getArchived());
     ui->checkLoggedIn->setChecked(trainee.getLoggedIn());
+
+    ui->btnOK->setEnabled(false);
 }
 
 Trainee DialogEditTrainee::getTrainee()