diff --git a/drupal/modules/epal/src/Controller/ApplicationSubmit.php b/drupal/modules/epal/src/Controller/ApplicationSubmit.php
index 743b93822c5f9599ab84d49599f36f58b40b7496..f53d82c07189f178255294f9569c2eb0e6091109 100755
--- a/drupal/modules/epal/src/Controller/ApplicationSubmit.php
+++ b/drupal/modules/epal/src/Controller/ApplicationSubmit.php
@@ -386,8 +386,6 @@ class ApplicationSubmit extends ControllerBase
 
             $existing = $esQuery->execute()->fetchAll(\PDO::FETCH_OBJ);
 
-/*            $existing = $this->entityTypeManager->getStorage('epal_student')
-                ->loadByProperties(['epaluser_id' => $epalUser->id->value]); */
             if ($existing && sizeof($existing) > 0) {
                 $crypt = new Crypt();
                 foreach ($existing as $candidate) {
diff --git a/drupal/modules/epal/src/Controller/SubmitedApplications.php b/drupal/modules/epal/src/Controller/SubmitedApplications.php
index 49c055766123bdb3123744c510c1833c2058df88..6d0558ee48b1965cd50909137e919dcacb88da69 100755
--- a/drupal/modules/epal/src/Controller/SubmitedApplications.php
+++ b/drupal/modules/epal/src/Controller/SubmitedApplications.php
@@ -738,6 +738,11 @@ class SubmitedApplications extends ControllerBase
                         "error_code" => 3002
                     ], Response::HTTP_FORBIDDEN);
             }
+            else if ($epalConfig->lock_application->value) {
+                return $this->respondWithStatus([
+                        "error_code" => 3002
+                    ], Response::HTTP_FORBIDDEN);
+            }
 
 
 
diff --git a/source/components/student-application-form/submited.aplication.preview.ts b/source/components/student-application-form/submited.aplication.preview.ts
index c62906aa899a1b0c92d98b424a969253b18f45bb..b02452beabf8460dcd2e56246aa3cc1b204e6627 100644
--- a/source/components/student-application-form/submited.aplication.preview.ts
+++ b/source/components/student-application-form/submited.aplication.preview.ts
@@ -90,14 +90,14 @@ import {Location} from '@angular/common';
                   <div *ngFor="let StudentDetails$  of SubmitedDetails$ | async" [hidden]="UserData$.id !== applicationIdActive" style="margin: 10px 10px 10px 10px;">
 
                     <div *ngIf = "StudentDetails$.applicantsResultsDisabled == '0'" >
-                      <div *ngIf = "StudentDetails$.status == '1' && StudentDetails$.secondPeriod == '0'" >
+                      <div *ngIf = "StudentDetails$.status == '1'" >
                         <div class="col-md-12" style="font-size: 1.0em; color: #143147; font-weight: bold;">
                           Ξ— αίτησΞ� σας ικανοποιΞ�ΞΈΞ·ΞΊΞ΅. ΞˆΟ‡Ξ΅Ο„Ξ΅ ΡπιλΡγΡί Ξ³ΞΉΞ± Ξ½Ξ± ΡγγραφΡίτΡ στο {{StudentDetails$.schoolName}}.
                           Παρακαλώ Ξ½Ξ± προσέλθΡτΡ Ξ‘ΞœΞ•Ξ£Ξ‘ στο σχολΡίο Ξ³ΞΉΞ± Ξ½Ξ± προχωρΞ�σΡι Ξ· διαδικασία ΡγγραφΞ�Ο‚ σας σΡ Ξ±Ο…Ο„ΟŒ, προσκομί΢οντας τα απαραίτητα δικαιολογητικά. ΔιΡύθυνση σχολΡίου: {{StudentDetails$.schoolAddress}}, ΀ηλέφωνο σχολΡίου: {{StudentDetails$.schoolTel}}<br><br>
                         </div>
                       </div>
 
-                      <div *ngIf = "StudentDetails$.status != '1'  && StudentDetails$.secondPeriod == '0'" >
+                      <div *ngIf = "StudentDetails$.status != '1'" >
                         <div class="col-md-12" style="font-size: 1.0em; color: #a52a2a; font-weight: bold;">
                           Ξ— αίτησΞ� σας Ρίναι σΡ Ξ΅ΞΊΞΊΟΞ΅ΞΌΟŒΟ„Ξ·Ο„Ξ±. Για την τοποθέτησΞ� σας ΞΊΞ±ΞΉ τις ΡνέργΡιΡς που πρέπΡι Ξ½Ξ±  κάνΡτΡ ΞΈΞ± ΡνημΡρωθΡίτΡ ΞΌΞ΅ Ξ½Ξ­ΞΏ ΞΌΞ�Ξ½Ο…ΞΌΞ±, ΞΌΞ΅ τον ίδιο Ο„ΟΟŒΟ€ΞΏ, μΡτά τις 8-7-2017.<br><br>
                         </div>