diff --git a/studs.php b/studs.php
index 52b9096..6a57efb 100644
--- a/studs.php
+++ b/studs.php
@@ -39,6 +39,7 @@ $poll_id = null;
 $poll = null;
 $message = null;
 $editingVoteId = 0;
+$editedVoteUniqueId = null;
 
 /* Services */
 /*----------*/
@@ -133,8 +134,8 @@ if (!empty($_POST['save'])) { // Save edition of an old vote
         $result = $pollService->updateVote($poll_id, $editedVote, $name, $choices);
         if ($result) {
             if ($poll->editable == Editable::EDITABLE_BY_OWN) {
-                $editedVoteUniqId = filter_input(INPUT_POST, 'edited_vote', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]);
-                $urlEditVote = Utils::getUrlSondage($poll_id, false, $editedVoteUniqId);
+                $editedVoteUniqueId = filter_input(INPUT_POST, 'edited_vote', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]);
+                $urlEditVote = Utils::getUrlSondage($poll_id, false, $editedVoteUniqueId);
                 $message = new Message('success', __('studs', 'Your vote has been registered successfully, but be careful: regarding this poll options, you need to keep this personal link to edit your own vote:'), $urlEditVote);
             } else {
                 $message = new Message('success', __('studs', 'Update vote succeeded'));
@@ -161,6 +162,7 @@ if (!empty($_POST['save'])) { // Save edition of an old vote
         if ($result) {
             if ($poll->editable == Editable::EDITABLE_BY_OWN) {
                 $urlEditVote = Utils::getUrlSondage($poll_id, false, $result->uniqId);
+                $editedVoteUniqueId =  $result->uniqId;
                 $message = new Message('success', __('studs', 'Your vote has been registered successfully, but be careful: regarding this poll options, you need to keep this personal link to edit your own vote:'), $urlEditVote);
             } else {
                 $message = new Message('success', __('studs', 'Adding the vote succeeded'));
@@ -216,5 +218,6 @@ $smarty->assign('editingVoteId', $editingVoteId);
 $smarty->assign('message', $message);
 $smarty->assign('admin', false);
 $smarty->assign('hidden', $poll->hidden);
+$smarty->assign('editedVoteUniqueId', $editedVoteUniqueId);
 
 $smarty->display('studs.tpl');
diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl
index 20fe885..4330968 100644
--- a/tpl/part/vote_table_classic.tpl
+++ b/tpl/part/vote_table_classic.tpl
@@ -94,7 +94,14 @@
 
                     {/foreach}
 
-                    {if $active && !$expired && ($poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL') or $admin)}
+                    {if $active && !$expired &&
+                        (
+                         $poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL')
+                         or ($poll->editable == constant('Framadate\Editable::EDITABLE_BY_OWN') && $editedVoteUniqueId == $vote->uniqId)
+                         or $admin
+                        )
+                    }
+
                         <td class="hidden-print">
                             <a href="{if $admin}{poll_url id=$poll->admin_id vote_id=$vote->uniqId admin=true}{else}{poll_url id=$poll->id vote_id=$vote->uniqId}{/if}" class="btn btn-default btn-sm" title="{__('Poll results', 'Edit the line:')|html} {$vote->name|html}">
                                 <i class="glyphicon glyphicon-pencil"></i><span class="sr-only">{__('Generic', 'Edit')}</span>
diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl
index 029e11f..f891f5e 100644
--- a/tpl/part/vote_table_date.tpl
+++ b/tpl/part/vote_table_date.tpl
@@ -145,7 +145,13 @@
 
                     {/foreach}
 
-                    {if $active && !$expired && ($poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL') or $admin)}
+                    {if $active && !$expired &&
+                        (
+                            $poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL')
+                            or ($poll->editable == constant('Framadate\Editable::EDITABLE_BY_OWN') && $editedVoteUniqueId == $vote->uniqId)
+                            or $admin
+                        )
+                    }
                         <td class="hidden-print">
                             <a href="{if $admin}{poll_url id=$poll->admin_id vote_id=$vote->uniqId admin=true}{else}{poll_url id=$poll->id vote_id=$vote->uniqId}{/if}" class="btn btn-default btn-sm" title="{__('Poll results', 'Edit the line:')|escape} {$vote->name|html}">
                                 <i class="glyphicon glyphicon-pencil"></i><span class="sr-only">{__('Generic', 'Edit')}</span>