diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php
index 4dc7b1fa..c4b68310 100644
--- a/www/application/controllers/Proj.php
+++ b/www/application/controllers/Proj.php
@@ -428,6 +428,7 @@ class Proj extends Users_Controller {
         //$this->load_files($data, $jobID);
 
         $data["sizeLimit"] = $this->backend_model->cfgReadChar("system.upload_size_limit");
+        $data["force_job_wait"] =  $this->backend_model->cfgReadChar("system.force_job_wait"); // configuration to supress wait time
 
         $this->load->model('dash_model');
         $out = $this->dash_model->getDashData($data);
@@ -440,11 +441,18 @@ class Proj extends Users_Controller {
         $data['this_is_client'] = false;
         $data['this_is_project_owner'] = false;
 
+
         $data['disabled1'] = 'disabled';
         $data['disabled2'] = 'disabled';
 
         $data['disabled11'] = 'disabled';
         $data['disabled22'] = 'disabled';
+
+        if ( $data["force_job_wait"] == 0 ){
+            //just forget about delays
+            $data['disabled1'] = $data['disabled2'] = $data['disabled11'] = $data['disabled22'] ='';
+        }
+
         /*
             $data['job_status'] = $jbD1->status;
             $data['job_member_id'] = $jbD1->member_id;
diff --git a/www/application/views/jobs/view_viewmyjoboffer.php b/www/application/views/jobs/view_viewmyjoboffer.php
index 56a9fb1f..5a05485b 100644
--- a/www/application/views/jobs/view_viewmyjoboffer.php
+++ b/www/application/views/jobs/view_viewmyjoboffer.php
@@ -176,7 +176,7 @@
                 </div>
             </div>
 
-      
+
     </div>
 </div>