diff --git a/app/classes/Framadate/Services/PollService.php b/app/classes/Framadate/Services/PollService.php
index 2ccb9f8fd3e731d2869a8d9927cf986bc925fc1f..2c4ed392f2aab42503c298aaa9094d1144bb8f4c 100644
--- a/app/classes/Framadate/Services/PollService.php
+++ b/app/classes/Framadate/Services/PollService.php
@@ -49,7 +49,7 @@ class PollService {
      * @return \stdClass|null The found poll, or null
      */
     function findById($poll_id) {
-        if (preg_match('/^[\w\d]{16}$/i', $poll_id)) {
+        if (preg_match(POLL_REGEX, $poll_id)) {
             return $this->pollRepository->findById($poll_id);
         }
 
@@ -57,7 +57,7 @@ class PollService {
     }
 
     public function findByAdminId($admin_poll_id) {
-        if (preg_match('/^[\w\d]{24}$/i', $admin_poll_id)) {
+        if (preg_match(ADMIN_POLL_REGEX, $admin_poll_id)) {
             return $this->pollRepository->findByAdminId($admin_poll_id);
         }
 
diff --git a/app/inc/constants.php b/app/inc/constants.php
index 2430ccec4acde0df719d698e5c91c377b1c25524..43a1fc487d9f6e17fe9c8346e1552c93aa8a3f9f 100644
--- a/app/inc/constants.php
+++ b/app/inc/constants.php
@@ -22,6 +22,7 @@ const VERSION = '0.9';
 
 // Regex
 const POLL_REGEX = '/^[a-z0-9-]*$/i';
+const ADMIN_POLL_REGEX = '/^[\w\d]{24}$/i';
 const CHOICE_REGEX = '/^[012]$/';
 const BOOLEAN_REGEX = '/^(on|off|true|false|1|0)$/i';
 const BOOLEAN_TRUE_REGEX = '/^(on|true|1)$/i';
diff --git a/studs.php b/studs.php
index 47a5626093857251543d283e6dba3cf1ff44afcf..67ff873d632c91fabf1f54bad4f4b47b8641a25f 100644
--- a/studs.php
+++ b/studs.php
@@ -58,9 +58,7 @@ $securityService = new SecurityService();
 
 if (!empty($_GET['poll'])) {
     $poll_id = filter_input(INPUT_GET, 'poll', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]);
-    if (strlen($poll_id) === 16) {
-        $poll = $pollService->findById($poll_id);
-    }
+    $poll = $pollService->findById($poll_id);
 }
 
 if (!$poll) {