diff --git a/adminstuds.php b/adminstuds.php
index ab2cacd..5555b82 100644
--- a/adminstuds.php
+++ b/adminstuds.php
@@ -223,6 +223,8 @@ if (!empty($_POST['save'])) { // Save edition of an old vote
             } else {
                 $message = new Message('danger', __('Error', 'Update vote failed'));
             }
+        } catch (AlreadyExistsException $aee) {
+            $message = new Message('danger', __('Error', 'The name you\'ve chosen already exist in this poll!'));
         } catch (ConcurrentEditionException $cee) {
             $message = new Message('danger', __('Error', 'Poll has been updated before you vote'));
         } catch (ConcurrentVoteException $cve) {
diff --git a/app/classes/Framadate/Repositories/VoteRepository.php b/app/classes/Framadate/Repositories/VoteRepository.php
index 1a74f5a..cbbbd77 100644
--- a/app/classes/Framadate/Repositories/VoteRepository.php
+++ b/app/classes/Framadate/Repositories/VoteRepository.php
@@ -85,4 +85,19 @@ class VoteRepository extends AbstractRepository {
         $prepared->execute([$poll_id, $name]);
         return $prepared->rowCount() > 0;
     }
+    
+    /**
+     * Check if name is already used for the given poll and another vote.
+     *
+     * @param int $poll_id ID of the poll
+     * @param string $name Name of the vote
+     * @param int $vote_id ID of the current vote
+     * @return bool true if vote already exists
+     */
+    public function existsByPollIdAndNameAndVoteId($poll_id, $name, $vote_id) {
+        $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('vote') . '` WHERE poll_id = ? AND name = ? AND id != ?');
+        $prepared->execute([$poll_id, $name, $vote_id]);
+        return $prepared->rowCount() > 0;
+    }
 }
+
diff --git a/app/classes/Framadate/Services/PollService.php b/app/classes/Framadate/Services/PollService.php
index ad180b1..d3d6590 100644
--- a/app/classes/Framadate/Services/PollService.php
+++ b/app/classes/Framadate/Services/PollService.php
@@ -88,24 +88,19 @@ class PollService {
      * @param $name
      * @param $choices
      * @param $slots_hash
+     * @throws AlreadyExistsException
      * @throws ConcurrentEditionException
      * @throws ConcurrentVoteException
      * @return bool
      */
     public function updateVote($poll_id, $vote_id, $name, $choices, $slots_hash) {
-        $poll = $this->findById($poll_id);
-
-        // Check that no-one voted in the meantime and it conflicts the maximum votes constraint
-        $this->checkMaxVotes($choices, $poll, $poll_id);
-
-        // Check if slots are still the same
-        $this->checkThatSlotsDidntChanged($poll, $slots_hash);
-
+        $this->checkVoteConstraints($choices, $poll_id, $slots_hash, $name, $vote_id);
+        
         // Update vote
         $choices = implode($choices);
         return $this->voteRepository->update($poll_id, $vote_id, $name, $choices);
     }
-
+    
     /**
      * @param $poll_id
      * @param $name
@@ -117,19 +112,8 @@ class PollService {
      * @return \stdClass
      */
     function addVote($poll_id, $name, $choices, $slots_hash) {
-        $poll = $this->findById($poll_id);
-
-        // Check that no-one voted in the meantime and it conflicts the maximum votes constraint
-        $this->checkMaxVotes($choices, $poll, $poll_id);
-
-        // Check if slots are still the same
-        $this->checkThatSlotsDidntChanged($poll, $slots_hash);
-
-        // Check if vote already exists
-        if ($this->voteRepository->existsByPollIdAndName($poll_id, $name)) {
-            throw new AlreadyExistsException();
-        }
-
+        $this->checkVoteConstraints($choices, $poll_id, $slots_hash, $name);
+        
         // Insert new vote
         $choices = implode($choices);
         $token = $this->random(16);
@@ -140,7 +124,8 @@ class PollService {
         if ($this->commentRepository->exists($poll_id, $name, $comment)) {
             return true;
         }
-            return $this->commentRepository->insert($poll_id, $name, $comment);
+        
+        return $this->commentRepository->insert($poll_id, $name, $comment);
     }
 
     /**
@@ -307,7 +292,38 @@ class PollService {
     private function random($length) {
         return Token::getToken($length);
     }
-
+    
+    /**
+     * @param $choices
+     * @param $poll_id
+     * @param $slots_hash
+     * @param $name
+     * @param string $vote_id
+     * @throws AlreadyExistsException
+     * @throws ConcurrentVoteException
+     * @throws ConcurrentEditionException
+     */
+    private function checkVoteConstraints($choices, $poll_id, $slots_hash, $name, $vote_id = FALSE) {
+        // Check if vote already exists with the same name
+        if (FALSE === $vote_id) {
+        	$exists = $this->voteRepository->existsByPollIdAndName($poll_id, $name);
+        } else {
+        	$exists = $this->voteRepository->existsByPollIdAndNameAndVoteId($poll_id, $name, $vote_id);
+        }
+        
+        if ($exists) {
+            throw new AlreadyExistsException();
+        }
+        
+        $poll = $this->findById($poll_id);
+        
+        // Check that no-one voted in the meantime and it conflicts the maximum votes constraint
+        $this->checkMaxVotes($choices, $poll, $poll_id);
+        
+        // Check if slots are still the same
+        $this->checkThatSlotsDidntChanged($poll, $slots_hash);
+    }
+    
     /**
      * This method checks if the hash send by the user is the same as the computed hash.
      *
diff --git a/studs.php b/studs.php
index 6cef3ee..2d5efab 100644
--- a/studs.php
+++ b/studs.php
@@ -145,7 +145,9 @@ if ($accessGranted) {
                 } else {
                     $message = new Message('danger', __('Error', 'Update vote failed'));
                 }
-            } catch (ConcurrentEditionException $cee) {
+            } catch (AlreadyExistsException $aee) {
+	            $message = new Message('danger', __('Error', 'The name you\'ve chosen already exist in this poll!'));
+	        } catch (ConcurrentEditionException $cee) {
                 $message = new Message('danger', __('Error', 'Poll has been updated before you vote'));
             } catch (ConcurrentVoteException $cve) {
                 $message = new Message('danger', __('Error', "Your vote wasn't counted, because someone voted in the meantime and it conflicted with your choices and the poll conditions. Please retry."));