diff --git a/app/classes/Framadate/Services/AdminPollService.php b/app/classes/Framadate/Services/AdminPollService.php
index f8482ae..9d77e84 100644
--- a/app/classes/Framadate/Services/AdminPollService.php
+++ b/app/classes/Framadate/Services/AdminPollService.php
@@ -35,15 +35,13 @@ class AdminPollService {
     {
         global $config;
 
-	$end_date = strtotime($poll->end_date);
+        if ($poll->end_date < $poll->creation_date) {
+           $poll->end_date = $poll->creation_date;
+        } elseif ($poll->end_date > $this->pollService->maxExpiryDate()) {
+           $poll->end_date = $this->pollService->maxExpiryDate();
+        }
 
-	if ($end_date < strtotime($poll->creation_date)) {
-	   $poll->end_date = $poll->creation_date;
-	} elseif ($end_date > $this->pollService->maxExpiryDate()) {
-	   $poll->end_date = utf8_encode(strftime('%Y-%m-%d', $this->pollService->maxExpiryDate()));
-	}
-
-	return $this->pollRepository->update($poll);
+        return $this->pollRepository->update($poll);
     }
 
     /**