diff --git a/src/app/config/PollConfig.ts b/src/app/config/PollConfig.ts
index e0a79319..1b5cd192 100644
--- a/src/app/config/PollConfig.ts
+++ b/src/app/config/PollConfig.ts
@@ -56,11 +56,11 @@ export class PollConfig {
     // access
     visibility = 'link_only'; // visible to anyone with the link:
     voteChoices = 'only_yes'; // possible answers to a vote choice: only "yes", "yes, maybe, no"
-    expirationDate = ''; // expiracy date
+    expirationDate = new Date().toString().substr(0, 10); // expiracy date
     passwordAccess = 0;
     password = '';
     customUrl = '';
-    canModifyAnswers =1;// everybody, self, nobody (= just admin)
+    canModifyAnswers = "self";// everybody, self, nobody (= just admin)
     whoCanChangeAnswers = 'everybody';// everybody, self, nobody (= just admin)
     dateList: DateOption[] = defaultDates; // sets of days as strings, config to set identical time for days in a special days poll
     timeList: DateOption[] = timeOfDay; // ranges of time expressed as strings
diff --git a/src/app/pages/visibility/visibility.component.html b/src/app/pages/visibility/visibility.component.html
index ffb85272..9e3b84d5 100644
--- a/src/app/pages/visibility/visibility.component.html
+++ b/src/app/pages/visibility/visibility.component.html
@@ -2,7 +2,6 @@
     {{"visibility.top_txt"|translate}}
 </h1>
 <section class="answers">
-
     <h2>
         {{"visibility.title"|translate}}
     </h2>
@@ -14,7 +13,7 @@
         id="visible_people"
         [(ngModel)]="config.visibility"
     >
-        <option value="link">
+        <option value="link_only">
             {{"visibility.visibility_link"|translate}}
         </option>
         <option value="only_me">
@@ -37,7 +36,7 @@
     <select
         name="votes"
         id="votes"
-        [(ngModel)]="config.visibility"
+        [(ngModel)]="config.voteChoices"
     >
         <option value="only_yes">
             {{"visibility.votes_possible_single"|translate}}
@@ -110,7 +109,10 @@
     <sub class="instructions">
         {{"visibility.access_instructions"|translate}}
     </sub>
-    {{"visibility.access_want"|translate}}
+    <br>
+    <label for="passwordAccess">
+        {{"visibility.access_want"|translate}}
+    </label>
     <select name="passwordAccess" id="passwordAccess" [(ngModel)]="config.passwordAccess">
         <option value="0">  {{"visibility.access_want_no"|translate}}</option>
         <option value="1">  {{"visibility.access_want_yes"|translate}}</option>
@@ -120,24 +122,34 @@
         {{"visibility.access_protect"|translate}}
     </label>
 
-    <input type="password"
-           name="password"
-           id="password"
-           min="8"
-           *ngIf="!showCustomPassword"
-           [(ngModel)]="config.password">
-    <input type="password"
-           name="password_visible"
-           id="password_visible"
-           min="8"
-           *ngIf="showCustomPassword"
-           [(ngModel)]="config.password">
-    <button class="btn btn--default" (click)="showCustomPassword = !showCustomPassword">
-        {{"visibility.see_pass"|translate}}
-    </button>
+    <div class="enablepassword" *ngIf="config.passwordAccess">
+
+        <input type="password"
+               name="password"
+               id="password"
+               min="8"
+               *ngIf="!showCustomPassword"
+               [(ngModel)]="config.password">
+        <input type="text"
+               name="password_visible"
+               id="password_visible"
+               min="8"
+               *ngIf="showCustomPassword"
+               [(ngModel)]="config.password">
+        <button class="btn btn--default" (click)="showCustomPassword = !showCustomPassword">
+            {{"visibility.see_pass"|translate}}
+        </button>
+    </div>
 </section>
 
 <a [routerLink]="'/step/end'"
    class="btn btn--primary">
     {{"visibility.validate_btn"|translate}}
 </a>
+<div class="back">
+
+    <a [routerLink]="'/step/answers'"
+       class="btn btn--back">
+        Retour
+    </a>
+</div>