diff --git a/app/classes/Framadate/Services/AdminPollService.php b/app/classes/Framadate/Services/AdminPollService.php
index c506dfc710ab5729b0b6a2a3d6d5b70974b20581..4445ef6ffd5d9087488ce09d5f35ca42a88a4cef 100644
--- a/app/classes/Framadate/Services/AdminPollService.php
+++ b/app/classes/Framadate/Services/AdminPollService.php
@@ -77,10 +77,12 @@ class AdminPollService {
     function deleteEntirePoll($poll_id) {
         $poll = $this->connect->findPollById($poll_id);
         $this->logService->log("DELETE_POLL", "id:$poll->poll_id, format:$poll->format, admin:$poll->admin_name, mail:$poll->admin_mail");
-        /*$this->connect->deleteVotesByPollId($poll_id);
+
+        // Delete the entire poll
+        $this->connect->deleteVotesByPollId($poll_id);
         $this->connect->deleteCommentsByPollId($poll_id);
         $this->connect->deleteSlotsByPollId($poll_id);
-        $this->connect->deleteByPollId($poll_id);*/
+        $this->connect->deleteByPollId($poll_id);
 
         return true;
     }
diff --git a/app/classes/Framadate/Services/PollService.php b/app/classes/Framadate/Services/PollService.php
index 25a4b2e3145f227b6b4914a23901128aaf964a85..7edcdf0042b0988be51d151957c90323b686c516 100644
--- a/app/classes/Framadate/Services/PollService.php
+++ b/app/classes/Framadate/Services/PollService.php
@@ -176,9 +176,9 @@ class PollService {
         // TODO Better random ?
         $string = '';
         $chaine = 'abcdefghijklmnopqrstuvwxyz123456789';
-        srand((double)microtime() * 1000000);
+        mt_srand();
         for ($i = 0; $i < $car; $i++) {
-            $string .= $chaine[rand() % strlen($chaine)];
+            $string .= $chaine[mt_rand() % strlen($chaine)];
         }
 
         return $string;