diff --git a/tpl/create_poll.tpl b/tpl/create_poll.tpl
index 2525d383d24225fd02cdb5561b83f393dca00a9c..19afac0ae2b1ab6f1b6d57d42ec6c1b3c3095c72 100644
--- a/tpl/create_poll.tpl
+++ b/tpl/create_poll.tpl
@@ -347,7 +347,7 @@
                                         {__('Step 1', 'Email addresses are required')}
                                     </label>
 				    <label>
-                                        <input type="radio" name="collect_users_mail" {if $collect_users_mail==constant("Framadate\Collect_mail::COLLECT_REQUIRED_VERIFIED")}checked{/if} value="{constant("Framadate\Collect_mail::COLLECT_REQUIRED_VERIFIED")}">
+                                        <input type="radio" disabled name="collect_users_mail" {if $collect_users_mail==constant("Framadate\Collect_mail::COLLECT_REQUIRED_VERIFIED")}checked{/if} value="{constant("Framadate\Collect_mail::COLLECT_REQUIRED_VERIFIED")}">
                                         {__('Step 1', 'Email addresses are required and verified')}
                                     </label>
                                 </div>
diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl
index aeda5fc0f6396141320c063d9cc29fe76708bbf1..d317ec37cc36426658c21f4fdf4d0e62f33d4626 100644
--- a/tpl/part/vote_table_classic.tpl
+++ b/tpl/part/vote_table_classic.tpl
@@ -30,7 +30,7 @@
                                class="btn btn-link btn-sm remove-column" title="{__('adminstuds', 'Remove the column')} {$slot->title|html}">
                                 <i class="glyphicon glyphicon-remove text-danger"></i><span class="sr-only">{__('Generic', 'Remove')}</span>
                             </a>
-			    {if $poll->collect_users_mail}
+			    {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT")}
 				    <a href="{poll_url id=$admin_poll_id admin=true action='collect_mail' action_value=($headersDCount)}"
 					   class="btn btn-link btn-sm collect-mail"
 		                           title="{__('adminstuds', 'Collect the emails of the polled users for the choice')} {$slot->title|html}">
@@ -68,8 +68,8 @@
                             <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
                             <input type="hidden" name="edited_vote" value="{$vote->uniqId}"/>
                             <input type="text" id="name" name="name" value="{$vote->name|html}" class="form-control" title="{__('Generic', 'Your name')}" placeholder="{__('Generic', 'Your name')}" />
-                            {if $poll->collect_users_mail}
-			    	<input type="email" required id="mail" name="mail" value="{$vote->mail|html}" class="form-control" title="{__('Generic', 'Your email address')}" placeholder="{__('Generic', 'Your email address')}" />
+                            {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT")}
+			    	<input type="email" {if $poll->collect_users_mail != constant("Framadate\Collect_mail::COLLECT")} required {/if} id="mail" name="mail" value="{$vote->mail|html}" class="form-control" title="{__('Generic', 'Your email address')}" placeholder="{__('Generic', 'Your email address')}" />
 			    {/if}
                         </div>
                     </td>
@@ -184,11 +184,11 @@
                         <div class="input-group input-group-sm">
                             <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
                             <input type="text" id="name" name="name" class="form-control" title="{__('Generic', 'Your name')}" placeholder="{__('Generic', 'Your name')}" />
-                            {if $poll->collect_users_mail}
+                            {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT")}
 				                <input type="email" required id="mail" name="mail" class="form-control" title="{__('Generic', 'Your email address')}" placeholder="{__('Generic', 'Your email address')}" />
 			                {/if}
                         </div>
-                        {if $poll->collect_users_mail && $poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL')}
+                        {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT") && $poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL')}
                             <div class="bg-danger">
                                 <i class="glyphicon glyphicon-alert"> </i>
                                 <label> {__('Poll results', 'Anyone will be able to access your email address after your vote')} </label>
diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl
index ae06a39ac707fb8c88e4f094156360e042621281..a70ebaa11b5eb5ddb351059c0fb7b82945ef0871 100644
--- a/tpl/part/vote_table_date.tpl
+++ b/tpl/part/vote_table_date.tpl
@@ -32,7 +32,7 @@
                                    title="{__('adminstuds', 'Remove the column')} {$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}">
                                     <i class="glyphicon glyphicon-remove text-danger"></i><span class="sr-only">{__('Generic', 'Remove')}</span>
                                 </a>
-				{if $poll->collect_users_mail}
+				{if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT")}
 					<a href="{poll_url id=$admin_poll_id admin=true action='collect_mail' action_value=($headersDCount)}"
 					   class="btn btn-link btn-sm collect-mail"
 		                           title="{__('adminstuds', 'Collect the emails of the polled users for the choice')} {$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}">
@@ -112,8 +112,8 @@
                             <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
                             <input type="hidden" name="edited_vote" value="{$vote->uniqId}"/>
                             <input type="text" id="name" name="name" value="{$vote->name|html}" class="form-control" title="{__('Generic', 'Your name')}" placeholder="{__('Generic', 'Your name')}" />
-			    {if $poll->collect_users_mail}
-			    	<input type="email" required id="mail" name="mail" value="{$vote->mail|html}" class="form-control" title="{__('Generic', 'Your email address')}" placeholder="{__('Generic', 'Your email address')}" />
+			    {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT")}
+			    	<input type="email" {if $poll->collect_users_mail != constant("Framadate\Collect_mail::COLLECT")} required {/if} id="mail" name="mail" value="{$vote->mail|html}" class="form-control" title="{__('Generic', 'Your email address')}" placeholder="{__('Generic', 'Your email address')}" />
 			    {/if}
                         </div>
                     </td>
@@ -239,11 +239,11 @@
                         <div class="input-group input-group-sm">
                             <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
                             <input type="text" id="name" name="name" class="form-control" title="{__('Generic', 'Your name')}" placeholder="{__('Generic', 'Your name')}" />
-                            {if $poll->collect_users_mail}
-                                <input type="email" required id="mail" name="mail" class="form-control" title="{__('Generic', 'Your email address')}" placeholder="{__('Generic', 'Your email address')}" />
+                            {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT")}
+                                <input type="email" {if $poll->collect_users_mail != constant("Framadate\Collect_mail::COLLECT")} required {/if} id="mail" name="mail" class="form-control" title="{__('Generic', 'Your email address')}" placeholder="{__('Generic', 'Your email address')}" />
                             {/if}
                         </div>
-                        {if $poll->collect_users_mail && $poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL')}
+                        {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT") && $poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL')}
                             <div class="bg-danger">
                                 <i class="glyphicon glyphicon-alert"> </i>
                                 <label> {__('Poll results', 'Anyone will be able to access your email address after your vote')} </label>