diff --git a/src/app/pages/poll-display/poll-display.component.html b/src/app/pages/poll-display/poll-display.component.html
index f3750420..896fda4e 100644
--- a/src/app/pages/poll-display/poll-display.component.html
+++ b/src/app/pages/poll-display/poll-display.component.html
@@ -74,7 +74,7 @@
         <framadate-vote-choice
             [choice]="choice"
             [pollIsSpecialDate]="config.currentPoll.data.kind == 'date'"
-            [simpleAnswer]="config.currentPoll.data.allowedAnswers == ['yes']" ></framadate-vote-choice >
+            [simpleAnswer]="config.currentPoll.data.allowedAnswers.length == 1 " ></framadate-vote-choice >
     </div >
 </div >
 <button
@@ -108,6 +108,14 @@
         name="crname"
         [(ngModel)]='config.myName'
         id="crname" >
+    <input
+        type="text"
+        name="cremail"
+        id="email_comment"
+        [(ngModel)]="config.myEmail" >
+    <label for='email_comment' >
+        <i class='fa fa-envelope' ></i >
+    </label >
     <div >
         <label for="comment" >Votre commentaire :</label >
         <br >
diff --git a/src/app/ui/vote-choice/vote-choice.component.html b/src/app/ui/vote-choice/vote-choice.component.html
index ed44346a..77f1a632 100644
--- a/src/app/ui/vote-choice/vote-choice.component.html
+++ b/src/app/ui/vote-choice/vote-choice.component.html
@@ -1,5 +1,7 @@
-<div class="choicebox selection-{{choice.answer}}" ><!-- add .choicebox--active to most voted -->
+<div class="choicebox selection-{{choice.answer}}" >
+    <!-- add .choicebox--active to most voted -->
     <button
+        *ngIf='showChangeChoicebutton'
         class='btn btn--primary'
         (click)=' choice.simpleAnswer = !choice.simpleAnswer' >
         <i class='fa fa-gears' ></i >
@@ -55,7 +57,7 @@
         </span >
         <span
             class="complex-answers"
-            *ngIf="!choice.simpleAnswer" >
+            *ngIf="!simpleAnswer" >
             <button
                 class="choicebox__btn choicebox__btn--maybe"
                 type="button"
diff --git a/src/app/ui/vote-choice/vote-choice.component.ts b/src/app/ui/vote-choice/vote-choice.component.ts
index 9deb76be..8397bf8e 100644
--- a/src/app/ui/vote-choice/vote-choice.component.ts
+++ b/src/app/ui/vote-choice/vote-choice.component.ts
@@ -25,6 +25,7 @@ interface VoteChoice {
 })
 export class VoteChoiceComponent {
 
+    public showChangeChoicebutton = false;
     @Input() public choice: any;
     @Input() public simpleAnswer: boolean = true;
     @Input() public pollIsSpecialDate: boolean = false;