diff --git a/app/classes/Framadate/Services/AdminPollService.php b/app/classes/Framadate/Services/AdminPollService.php
index 0f76150..46f8ec4 100644
--- a/app/classes/Framadate/Services/AdminPollService.php
+++ b/app/classes/Framadate/Services/AdminPollService.php
@@ -33,10 +33,20 @@ class AdminPollService {
 
     function updatePoll($poll) {
         global $config;
-        if ($poll->end_date > $poll->creation_date) {
-            return $this->pollRepository->update($poll);
-        }  
-            return false;
+
+	$end_date = strtotime($poll->end_date);
+
+	if ($end_date < strtotime($poll->creation_date)) {
+
+	   $poll->end_date = $poll->creation_date;
+
+	} elseif ($end_date > $this->pollService->maxExpiryDate()) {
+	
+	   $poll->end_date = $this->pollService->maxExpiryDate();
+	   
+	}
+
+	return $this->pollRepository->update($poll);
     }
 
     /**