3 files changed, 27 insertions, 8 deletions

diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.html b/client/src/app/+videos/+video-edit/shared/video-edit.component.html
index ee5a50611..1c0ec72d1 100644
--- a/client/src/app/+videos/+video-edit/shared/video-edit.component.html
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.html
@@ -227,15 +227,23 @@
             </div>
 
             <div class="form-group">
-              <my-peertube-checkbox inputName="liveVideoPermanentLive" formControlName="permanentLive">
-                <ng-template ptTemplate="label">
-                  <ng-container i18n>This is a permanent live</ng-container>
-                </ng-template>
+              <div class="peertube-radio-container">
+                <input type="radio" formControlName="permanentLive" id="permanentLiveFalse" [value]="false">
+                <label i18n for="permanentLiveFalse" class="radio">This is a normal live</label>
 
-                <ng-container ngProjectAs="description">
-                  <span i18n>You can stream multiple times in a permanent live. The URL for your viewers won't change but you cannot save replays of your lives</span>
-                </ng-container>
-              </my-peertube-checkbox>
+                <span class="form-group-description" i18n>
+                  You can't stream multiple times in a normal live, but you can save a replay of it that will use the same URL
+                </span>
+              </div>
+
+              <div class="peertube-radio-container">
+                <input type="radio" formControlName="permanentLive" id="permanentLiveTrue" [value]="true">
+                <label i18n for="permanentLiveTrue" class="radio">This is a permanent/recurring live</label>
+
+                <span class="form-group-description" i18n>
+                  You can stream multiple times in a permanent/recurring live. The URL for your viewers won't change but you cannot save replays of your lives
+                </span>
+              </div>
             </div>
 
             <div class="form-group" *ngIf="isSaveReplayEnabled()">
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts
index 2065e4e8e..ee7011b4c 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts
@@ -70,6 +70,8 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView
       waitTranscoding: true,
       commentsEnabled: true,
       downloadEnabled: true,
+      permanentLive: false,
+      saveReplay: false,
       channelId: this.firstStepChannelId
     }
 
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 679c235a6..0634f4677 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -438,6 +438,8 @@
     cursor: pointer;
     line-height: 20px;
     display: inline-block;
+    font-size: 15px;
+    font-weight: $font-regular;
   }
 
   [type=radio]:checked + label::before,
@@ -473,6 +475,13 @@
     opacity: 1;
     transform: scale(1);
   }
+
+  .form-group-description {
+    display: block;
+    margin-top: -10px;
+    margin-bottom: 10px;
+    margin-left: 29px;
+  }
 }
 
 @mixin peertube-checkbox ($border-width) {