diff --git a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component.ts b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component.ts
index be5ec9ecf0..24b39189e1 100644
--- a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component.ts
@@ -1,5 +1,4 @@
-import { Directive, inject, signal, viewChild } from '@angular/core';
-import { rxResource } from '@angular/core/rxjs-interop';
+import { computed, Directive, inject, signal, viewChild } from '@angular/core';
 import { UntypedFormBuilder } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Fqid, Id } from '@app/domain/definitions/key-types';
@@ -8,7 +7,6 @@ import { PollVisibility } from '@app/domain/models/poll';
 import { PollUpdatePayload } from '@app/gateways/vote-api.service';
 import { ViewPoll } from '@app/site/pages/meetings/pages/polls';
 import { BaseUiComponent } from '@app/ui/base/base-ui-component';
-import { map } from 'rxjs';
 
 import { PollEditResultComponent } from '../components/poll-edit-result/poll-edit-result.component';
 import { PollFormComponent } from '../components/poll-form/poll-form.component';
@@ -42,21 +40,17 @@ export abstract class BasePollDialogComponent extends BaseUiComponent {
     protected pollForm = viewChild.required(PollFormComponent);
     protected pollResultForm = viewChild(PollEditResultComponent);
 
-    public get formsValid(): boolean {
+    public formsValid = computed<boolean>(() => {
         if (!this.pollForm) {
             return false;
         }
 
-        return this.pollForm().pollForm.valid;
-    }
+        return this.pollForm().isValid();
+    });
 
     public analogPollFormOpen = signal(false);
-    public isAnalogPoll = rxResource({
-        params: () => this.pollForm(),
-        defaultValue: false,
-        stream({ params }) {
-            return params.pollForm.get(`visibility`).valueChanges.pipe(map(v => v === PollVisibility.Manually));
-        }
+    public isAnalogPoll = computed(() => {
+        return this.pollForm().form.visibility().value() === PollVisibility.Manually;
     });
 
     protected formBuilder = inject(UntypedFormBuilder);
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-config-form-base.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-config-form-base.component.ts
index 242b2897db..d8c6410c79 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-config-form-base.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-config-form-base.component.ts
@@ -1,4 +1,5 @@
-import { Component, computed, effect, inject, input } from '@angular/core';
+import { Component, computed, effect, inject, input, signal } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { PollState } from '@app/domain/models/poll';
 
@@ -10,16 +11,19 @@ export abstract class PollFormBaseComponent {
 
     public data = input.required<Partial<ViewPoll>>();
 
+    public formValid = signal<boolean>(false);
+
     public pollStarted = computed<boolean>(() => {
         return this.data().state && this.data().state !== PollState.Created;
     });
 
-    protected fb = inject(UntypedFormBuilder);
+    protected readonly fb = inject(UntypedFormBuilder);
 
     public constructor() {
         this.initForm();
 
         effect(this.onDataUpdated.bind(this));
+        this.form.valueChanges.pipe(takeUntilDestroyed()).subscribe(() => this.formValid.set(this.form.valid));
     }
 
     protected abstract initForm(): void;
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.html
index 3b022e2056..ab8de93af6 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.html
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="form">
-    @if (!pollStarted()) {
+    @if (!pollStarted() && !hideMethod()) {
         <div class="margin-bottom-15 info-grid">
             <mat-form-field>
                 <mat-label>{{ 'Election method' | translate }}</mat-label>
@@ -8,19 +8,23 @@
                     <mat-option [value]="true">{{ 'Yes/No/Abstain' | translate }}</mat-option>
                 </mat-select>
             </mat-form-field>
+            <div></div>
         </div>
     }
 
-    <mat-form-field>
-        <mat-label>{{ '100% base' | translate }}</mat-label>
-        <mat-select formControlName="onehundred_percent_base" panelClass="percent-base-panel" required>
-            @for (option of validPercentBases; track option[0]) {
-                @if (option[0] !== 'yes_no_abstain' || form.get('allow_abstain').getRawValue()) {
-                    <mat-option [value]="option[0]">
-                        {{ option[1] | translate }}
-                    </mat-option>
+    <div class="info-grid">
+        <mat-form-field>
+            <mat-label>{{ '100% base' | translate }}</mat-label>
+            <mat-select formControlName="onehundred_percent_base" panelClass="percent-base-panel" required>
+                @for (option of validPercentBases; track option[0]) {
+                    @if (option[0] !== 'yes_no_abstain' || form.get('allow_abstain').getRawValue()) {
+                        <mat-option [value]="option[0]">
+                            {{ option[1] | translate }}
+                        </mat-option>
+                    }
                 }
-            }
-        </mat-select>
-    </mat-form-field>
+            </mat-select>
+        </mat-form-field>
+        <div></div>
+    </div>
 </form>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.scss
index e69de29bb2..5d1fd49df1 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.scss
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.scss
@@ -0,0 +1,9 @@
+.info-grid {
+    display: grid;
+    column-gap: 1em;
+    grid-template-columns: repeat(auto-fit, minmax(100px, 1fr));
+
+    > mat-checkbox {
+        padding-top: 10px;
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.ts
index 36d31e90b1..2defeb98ee 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -9,6 +9,11 @@ import { _, TranslatePipe } from '@ngx-translate/core';
 import { ViewPoll } from '../../../../pages/polls';
 import { PollFormBaseComponent } from '../poll-config-form-base.component';
 
+export interface PollFormApproval {
+    allow_abstain: boolean;
+    onehundred_percent_base: ApprovalOnehundredPercentBase;
+}
+
 @Component({
     selector: 'os-poll-form-approval',
     imports: [ReactiveFormsModule, MatFormFieldModule, MatSelectModule, MatCheckboxModule, TranslatePipe],
@@ -17,6 +22,8 @@ import { PollFormBaseComponent } from '../poll-config-form-base.component';
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class PollFormApprovalComponent extends PollFormBaseComponent {
+    public hideMethod = input<boolean>(false);
+
     public validPercentBases: [ApprovalOnehundredPercentBase, string][] = [
         [`yes_no`, _('Yes/No')],
         [`yes_no_abstain`, _('Yes/No/Abstain')],
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.html
index bbfe3d37a3..18edc2d996 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.html
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.html
@@ -1,14 +1,16 @@
 <form [formGroup]="form">
     <div class="poll-preview-meta-info-form">
         @if (!pollStarted()) {
-            <mat-form-field>
-                <mat-label>{{ 'Election method' | translate }}</mat-label>
-                <mat-select formControlName="allow_abstain">
-                    <mat-option [value]="false">{{ 'Yes/No' | translate }}</mat-option>
-                    <mat-option [value]="true">{{ 'Yes/No/Abstain' | translate }}</mat-option>
-                </mat-select>
-            </mat-form-field>
-            <div class="margin-bottom-15 info-grid">
+            @if (!hideMethod()) {
+                <mat-form-field>
+                    <mat-label>{{ 'Election method' | translate }}</mat-label>
+                    <mat-select formControlName="allow_abstain">
+                        <mat-option [value]="false">{{ 'Yes/No' | translate }}</mat-option>
+                        <mat-option [value]="true">{{ 'Yes/No/Abstain' | translate }}</mat-option>
+                    </mat-select>
+                </mat-form-field>
+            }
+            <div class="info-grid">
                 <mat-form-field>
                     <mat-label>{{ 'Min amount of votes' | translate }}</mat-label>
                     <input formControlName="min_options_amount" matInput required type="number" />
@@ -18,7 +20,10 @@
                     <mat-label>{{ 'Max amount of votes' | translate }}</mat-label>
                     <input formControlName="max_options_amount" matInput required type="number" />
                 </mat-form-field>
+            </div>
 
+            <div class="margin-bottom-15 info-grid">
+                <div></div>
                 <mat-form-field>
                     <mat-label>{{ 'Max amount of yes votes' | translate }}</mat-label>
                     <input formControlName="max_yes_amount" matInput required type="number" />
@@ -26,17 +31,20 @@
             </div>
         }
 
-        <mat-form-field>
-            <mat-label>{{ '100% base' | translate }}</mat-label>
-            <mat-select formControlName="onehundred_percent_base" panelClass="percent-base-panel" required>
-                @for (option of validPercentBases; track option) {
-                    @if (option[0] !== 'yes_no_abstain' || form.get('allow_abstain').getRawValue()) {
-                        <mat-option [value]="option[0]">
-                            {{ option[1] | translate }}
-                        </mat-option>
+        <div class="info-grid">
+            <mat-form-field>
+                <mat-label>{{ '100% base' | translate }}</mat-label>
+                <mat-select formControlName="onehundred_percent_base" panelClass="percent-base-panel" required>
+                    @for (option of validPercentBases; track option) {
+                        @if (option[0] !== 'yes_no_abstain' || form.get('allow_abstain').getRawValue()) {
+                            <mat-option [value]="option[0]">
+                                {{ option[1] | translate }}
+                            </mat-option>
+                        }
                     }
-                }
-            </mat-select>
-        </mat-form-field>
+                </mat-select>
+            </mat-form-field>
+            <div></div>
+        </div>
     </div>
 </form>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.ts
index caeb7839c5..c26adfa5f5 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.ts
@@ -5,11 +5,20 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { MatSelectModule } from '@angular/material/select';
 import { RatingApprovalOnehundredPercentBase } from '@app/domain/models/poll/poll-config-rating-approval';
+import { RatingScoreOnehundredPercentBase } from '@app/domain/models/poll/poll-config-rating-score';
 import { _, TranslatePipe } from '@ngx-translate/core';
 
 import { ViewPoll } from '../../../../pages/polls';
 import { PollFormBaseComponent } from '../poll-config-form-base.component';
 
+export interface PollFormRatingApproval {
+    max_options_amount: number;
+    min_options_amount: number;
+    max_yes_amount: number;
+    onehundred_percent_base: RatingScoreOnehundredPercentBase;
+    display_chart: string;
+}
+
 @Component({
     selector: 'os-poll-form-rating-approval',
     imports: [
@@ -35,6 +44,7 @@ export class PollFormRatingApprovalComponent extends PollFormBaseComponent {
         [`disabled`, _('Disabled (no percents)')]
     ];
 
+    public hideMethod = input<boolean>(false);
     public optionAmount = input<number>(null);
 
     protected initForm(): void {
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-score/poll-form-rating-score.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-score/poll-form-rating-score.component.html
index a310e2ff61..625582fb7d 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-score/poll-form-rating-score.component.html
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-score/poll-form-rating-score.component.html
@@ -1,13 +1,7 @@
 <form [formGroup]="form">
     <div class="poll-preview-meta-info-form">
         @if (!pollStarted()) {
-            <div class="margin-bottom-15">
-                <mat-checkbox formControlName="allow_general_abstain">
-                    {{ 'General abstain' | translate }}
-                </mat-checkbox>
-            </div>
-
-            <div class="margin-bottom-15 info-grid">
+            <div class="info-grid">
                 @if (!form.get('allow_general_abstain').value) {
                     <mat-form-field>
                         <mat-label>{{ 'Min amount of votes' | translate }}</mat-label>
@@ -23,7 +17,7 @@
                 </mat-form-field>
             </div>
 
-            <div class="margin-bottom-15 info-grid">
+            <div class="info-grid">
                 @if (!form.get('allow_general_abstain').value) {
                     <mat-form-field>
                         <mat-label>{{ 'Min amount of options voted' | translate }}</mat-label>
@@ -40,22 +34,32 @@
             </div>
 
             <div class="margin-bottom-15 info-grid">
+                <div></div>
                 <mat-form-field>
                     <mat-label>{{ 'Max votes per option' | translate }}</mat-label>
                     <input formControlName="max_votes_per_option" matInput type="number" />
                 </mat-form-field>
             </div>
+
+            <div class="margin-bottom-15">
+                <mat-checkbox formControlName="allow_general_abstain">
+                    {{ 'General abstain' | translate }}
+                </mat-checkbox>
+            </div>
         }
 
-        <mat-form-field>
-            <mat-label>{{ '100% base' | translate }}</mat-label>
-            <mat-select formControlName="onehundred_percent_base" panelClass="percent-base-panel" required>
-                @for (option of validPercentBases; track option) {
-                    <mat-option [value]="option[0]">
-                        {{ option[1] | translate }}
-                    </mat-option>
-                }
-            </mat-select>
-        </mat-form-field>
+        <div class="margin-bottom-15 info-grid">
+            <mat-form-field>
+                <mat-label>{{ '100% base' | translate }}</mat-label>
+                <mat-select formControlName="onehundred_percent_base" panelClass="percent-base-panel" required>
+                    @for (option of validPercentBases; track option) {
+                        <mat-option [value]="option[0]">
+                            {{ option[1] | translate }}
+                        </mat-option>
+                    }
+                </mat-select>
+            </mat-form-field>
+            <div></div>
+        </div>
     </div>
 </form>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-score/poll-form-rating-score.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-score/poll-form-rating-score.component.ts
index 10814bcc6c..507e05ccd2 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-score/poll-form-rating-score.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-score/poll-form-rating-score.component.ts
@@ -10,6 +10,15 @@ import { _, TranslatePipe } from '@ngx-translate/core';
 import { ViewPoll } from '../../../../pages/polls';
 import { PollFormBaseComponent } from '../poll-config-form-base.component';
 
+export interface PollFormRatingScore {
+    max_options_amount: number;
+    min_options_amount: number;
+    max_votes_per_option: number;
+    max_vote_sum: number;
+    min_vote_sum: number;
+    onehundred_percent_base: RatingScoreOnehundredPercentBase;
+}
+
 @Component({
     selector: 'os-poll-form-rating-score',
     imports: [
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.html
index f40ac83155..7bb516f5e3 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.html
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="form">
-    @if (!pollStarted()) {
+    @if (!pollStarted() && !hideMethod()) {
         <div class="margin-bottom-15">
             <mat-form-field>
                 <mat-label>{{ 'Election method' | translate }}</mat-label>
@@ -13,20 +13,6 @@
 
     <div class="poll-preview-meta-info-form">
         @if (!pollStarted()) {
-            <div class="margin-bottom-15">
-                <mat-checkbox formControlName="allow_general_abstain">
-                    {{ 'General abstain' | translate }}
-                </mat-checkbox>
-
-                <mat-checkbox formControlName="allow_nota">
-                    @if (form.get('strike_out').value) {
-                        {{ 'General approval' | translate }}
-                    } @else {
-                        {{ 'General rejection' | translate }}
-                    }
-                </mat-checkbox>
-            </div>
-
             <div class="info-grid">
                 @if (!form.get('allow_general_abstain').value) {
                     <mat-form-field>
@@ -42,6 +28,20 @@
                     <input formControlName="max_options_amount" matInput required type="number" />
                 </mat-form-field>
             </div>
+
+            <div class="margin-bottom-15">
+                <mat-checkbox formControlName="allow_general_abstain">
+                    {{ 'General abstain' | translate }}
+                </mat-checkbox>
+
+                <mat-checkbox formControlName="allow_nota">
+                    @if (form.get('strike_out').value) {
+                        {{ 'General approval' | translate }}
+                    } @else {
+                        {{ 'General rejection' | translate }}
+                    }
+                </mat-checkbox>
+            </div>
         }
 
         <div class="margin-bottom-15 info-grid">
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.ts
index afc7273c37..295b139288 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.ts
@@ -9,6 +9,15 @@ import { _, TranslatePipe } from '@ngx-translate/core';
 import { ViewPoll } from '../../../../pages/polls';
 import { PollFormBaseComponent } from '../poll-config-form-base.component';
 
+export interface PollFormSelection {
+    max_options_amount: number;
+    min_options_amount: number;
+    allow_nota: boolean;
+    onehundred_percent_base: SelectionOnehundredPercentBase;
+    strike_out: boolean;
+    display_chart: string;
+}
+
 @Component({
     selector: 'os-poll-form-selection',
     imports: [ReactiveFormsModule, MatCheckboxModule, MatInputModule, MatSelectModule, TranslatePipe],
@@ -26,6 +35,7 @@ export class PollFormSelectionComponent extends PollFormBaseComponent {
         [`disabled`, _('Disabled (no percents)')]
     ];
 
+    public hideMethod = input<boolean>(false);
     public optionAmount = input<number>(null);
 
     public getSerialzedForm(): Record<string, unknown> {
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.html
index 8e70ae53fd..c714b6b43b 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.html
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.html
@@ -1,21 +1,21 @@
 <div class="os-form-card-mobile">
     <!-- Poll Title -->
-    <form [formGroup]="pollForm">
+    <form [formRoot]="form">
         <mat-form-field>
             <mat-label>{{ 'Title' | translate }}</mat-label>
             <h2 class="poll-preview-title">
-                <input formControlName="title" matInput required />
+                <input matInput [formField]="form.title" />
             </h2>
         </mat-form-field>
 
         <div class="poll-preview-meta-info-form">
-            @if (!data() || !data().state || data().isCreated) {
-                <div class="info-grid">
-                    <!-- Poll Visibility -->
-                    @if (isEVotingEnabled()) {
+            @if (!data() || isCreated()) {
+                @if (isEVotingEnabled()) {
+                    <div class="info-grid">
+                        <!-- Poll Visibility -->
                         <mat-form-field>
                             <mat-label>{{ 'Visibility' | translate }}</mat-label>
-                            <mat-select formControlName="visibility" required>
+                            <mat-select [formField]="form.visibility">
                                 @for (entry of visibilityOptions | keyvalue; track entry.value) {
                                     <mat-option [value]="entry.value">
                                         {{ entry.value | translateKey: 'poll_visibility' }}
@@ -27,14 +27,12 @@ <h2 class="poll-preview-title">
                             }
                             <mat-error>{{ 'This field is required.' | translate }}</mat-error>
                         </mat-form-field>
-                    }
 
-                    <!-- Groups entitled to Vote -->
-                    @if (isEVotingSelected) {
+                        <!-- Groups entitled to Vote -->
                         <mat-form-field>
                             <mat-label>{{ 'Entitled to vote' | translate }}</mat-label>
                             <os-repo-search-selector
-                                formControlName="entitled_group_ids"
+                                [formField]="form.entitled_group_ids"
                                 [multiple]="true"
                                 [pipeFn]="groupRepo.getFilterSystemGroupFn()"
                                 [repo]="groupRepo"
@@ -42,13 +40,13 @@ <h2 class="poll-preview-title">
                                 [sortFn]="sortFn"
                             ></os-repo-search-selector>
                         </mat-form-field>
-                    }
-                </div>
+                    </div>
+                }
 
                 <div class="margin-bottom-15">
                     <!-- Live voting -->
-                    @if (isLiveVotingAvailable) {
-                        <mat-checkbox formControlName="live_voting_enabled">
+                    @if (isLiveVotingAvailable()) {
+                        <mat-checkbox [formField]="form.live_voting_enabled">
                             {{ 'Live voting' | translate }}
                         </mat-checkbox>
                         <mat-hint>
@@ -57,17 +55,99 @@ <h2 class="poll-preview-title">
                     }
                 </div>
             }
+
+            @if (!customConfigForm()) {
+                <div class="margin-bottom-15">
+                    <div class="info-grid">
+                        <mat-form-field>
+                            <mat-label>{{ 'Election method' | translate }}</mat-label>
+                            <mat-select [formField]="form.method_preselection">
+                                @if (optionAmount() <= 1 && form.options().value().length <= 1) {
+                                    <mat-option value="approval.yes_no">{{ 'Yes/No' | translate }}</mat-option>
+                                    <mat-option value="approval.yes_no_abstain">
+                                        {{ 'Yes/No/Abstain' | translate }}
+                                    </mat-option>
+                                }
+
+                                @if (optionAmount() > 1 || form.options().value().length > 1) {
+                                    @if (optionType() === 'text') {
+                                        <mat-option value="selection.yes">
+                                            {{ 'Yes per option' | translate }}
+                                        </mat-option>
+                                        <mat-option value="selection.no">{{ 'No per option' | translate }}</mat-option>
+                                        <mat-option value="rating_approval.yes_no">
+                                            {{ 'Yes/No per option' | translate }}
+                                        </mat-option>
+                                        <mat-option value="rating_approval.yes_no_abstain">
+                                            {{ 'Yes/No/Abstain per option' | translate }}
+                                        </mat-option>
+                                        @if (allowCumulative()) {
+                                            <mat-option value="rating_score">
+                                                {{ 'Amount per option' | translate }}
+                                            </mat-option>
+                                        }
+                                    } @else {
+                                        <mat-option value="selection.yes">
+                                            {{ 'Yes per candidate' | translate }}
+                                        </mat-option>
+                                        <mat-option value="selection.no">
+                                            {{ 'No per candidate' | translate }}
+                                        </mat-option>
+                                        <mat-option value="rating_approval.yes_no">
+                                            {{ 'Yes/No per candidate' | translate }}
+                                        </mat-option>
+                                        <mat-option value="rating_approval.yes_no_abstain">
+                                            {{ 'Yes/No/Abstain per candidate' | translate }}
+                                        </mat-option>
+                                        @if (allowCumulative()) {
+                                            <mat-option value="rating_score">
+                                                {{ 'Amount per candidate' | translate }}
+                                            </mat-option>
+                                        }
+                                    }
+                                }
+
+                                @if (optionAmount() > 1 || form.options().value().length > 1) {
+                                    <mat-option value="approval.yes_no">{{ 'Yes/No per list' | translate }}</mat-option>
+                                    <mat-option value="approval.yes_no_abstain">
+                                        {{ 'Yes/No/Abstain per list' | translate }}
+                                    </mat-option>
+                                }
+                            </mat-select>
+                            <mat-error>{{ 'This field is required.' | translate }}</mat-error>
+                        </mat-form-field>
+                        <div></div>
+                    </div>
+                </div>
+            }
         </div>
     </form>
 
-    <ng-content></ng-content>
+    <ng-content>
+        <div class="method">
+            @switch (this.selectedMethod()) {
+                @case ('approval') {
+                    <os-poll-form-approval [data]="data()" [hideMethod]="true" />
+                }
+                @case ('selection') {
+                    <os-poll-form-selection [data]="data()" [hideMethod]="true" [optionAmount]="optionAmount()" />
+                }
+                @case ('rating_approval') {
+                    <os-poll-form-rating-approval [data]="data()" [hideMethod]="true" [optionAmount]="optionAmount()" />
+                }
+                @case ('rating_score') {
+                    <os-poll-form-rating-score [data]="data()" [optionAmount]="optionAmount()" />
+                }
+            }
+        </div>
+    </ng-content>
 
     @if (optionEdit()) {
         <div class="option-section">
             <h4 class="option-section-title">{{ 'Options' | translate }}</h4>
             <os-editable-list
                 placeholder="New option"
-                [items]="pollForm.get('options').value"
+                [items]="form.options().value()"
                 (itemsChange)="onOptionsChange($event)"
             />
         </div>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.ts
index a25b66d345..7f82d65bee 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.ts
@@ -1,33 +1,60 @@
 import { KeyValuePipe } from '@angular/common';
-import { Component, effect, inject, input, OnInit, ViewEncapsulation } from '@angular/core';
-import { AbstractControl, ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { Component, computed, effect, inject, input, signal, viewChild, ViewEncapsulation } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { ReactiveFormsModule } from '@angular/forms';
+import { form, FormField, FormRoot, required } from '@angular/forms/signals';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatDialog } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 import { MatSelectModule } from '@angular/material/select';
+import { Ids } from '@app/domain/definitions/key-types';
 import { PollVisibility } from '@app/domain/models/poll';
 import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings';
+import { collectionFromFqid } from '@app/infrastructure/utils/transform-functions';
 import { BaseComponent } from '@app/site/base/base.component';
+import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service';
 import { DirectivesModule } from '@app/ui/directives';
 import { EditableListComponent } from '@app/ui/modules/editable-list';
 import { SearchSelectorModule } from '@app/ui/modules/search-selector';
 import { PipesModule } from '@app/ui/pipes';
 import { TranslatePipe } from '@ngx-translate/core';
-import { combineLatest, startWith } from 'rxjs';
 
 import { GroupControllerService, ViewGroup } from '../../../../pages/participants';
 import { ViewPoll } from '../../../../pages/polls';
+import { PollFormApprovalComponent } from '../poll-form-approval/poll-form-approval.component';
+import { PollFormRatingApprovalComponent } from '../poll-form-rating-approval/poll-form-rating-approval.component';
+import { PollFormRatingScoreComponent } from '../poll-form-rating-score/poll-form-rating-score.component';
+import { PollFormSelectionComponent } from '../poll-form-selection/poll-form-selection.component';
 import { VotingPrivacyWarningDialogComponent } from '../voting-privacy-warning/voting-privacy-warning-dialog.component';
 
+interface PollForm {
+    title: string;
+    visibility: PollVisibility;
+    entitled_group_ids: Ids;
+    live_voting_enabled: boolean;
+    option_type: 'meeting_user' | 'text';
+    options: any[];
+    method: 'approval' | 'selection' | 'rating_approval' | 'rating_score';
+    method_preselection: string | null;
+}
+
 @Component({
     selector: `os-poll-form`,
     templateUrl: `./poll-form.component.html`,
     styleUrls: [`./poll-form.component.scss`],
     imports: [
+        PollFormApprovalComponent,
+        PollFormSelectionComponent,
+        PollFormRatingApprovalComponent,
+        PollFormRatingScoreComponent,
         EditableListComponent,
         TranslatePipe,
+        FormField,
+        FormRoot,
         MatInputModule,
+        MatIconModule,
         MatFormFieldModule,
         MatCheckboxModule,
         MatSelectModule,
@@ -39,13 +66,18 @@ import { VotingPrivacyWarningDialogComponent } from '../voting-privacy-warning/v
     ],
     encapsulation: ViewEncapsulation.None
 })
-export class PollFormComponent extends BaseComponent implements OnInit {
-    public pollForm: UntypedFormGroup;
+export class PollFormComponent extends BaseComponent {
+    private approvalForm = viewChild(PollFormApprovalComponent);
+    private selectionForm = viewChild(PollFormSelectionComponent);
+    private ratingApprovalForm = viewChild(PollFormRatingApprovalComponent);
+    private ratingScoreForm = viewChild(PollFormRatingScoreComponent);
 
     public readonly visibilityOptions = PollVisibility;
 
     public showNonNominalWarning = false;
 
+    public customConfigForm = input<boolean>(false);
+    public optionAmount = input<number>(0);
     public optionType = input<'meeting_user' | 'text'>('text');
     public optionEdit = input<boolean>(false);
     public isEVotingEnabled = input.required<boolean>();
@@ -54,61 +86,117 @@ export class PollFormComponent extends BaseComponent implements OnInit {
 
     public readonly data = input<Partial<ViewPoll>>({});
 
-    public get isCreated(): boolean {
+    public allowCumulative = signal(false);
+    private pollModel = signal<PollForm>({
+        title: ``,
+        visibility: PollVisibility.Open,
+        entitled_group_ids: [],
+        live_voting_enabled: false,
+        option_type: 'text',
+        options: [],
+        method: null,
+        method_preselection: `selection.yes`
+    });
+
+    public form = form(this.pollModel, schemaPath => {
+        required(schemaPath.title);
+        required(schemaPath.visibility);
+        if (!this.customConfigForm()) {
+            required(schemaPath.method_preselection);
+        }
+    });
+
+    public isValid = computed<boolean>(() => {
+        return this.form().valid() && this.methodForm()?.formValid();
+    });
+
+    public isCreated = computed<boolean>(() => {
         return !this.data()?.state || this.data().isCreated;
-    }
+    });
 
-    public get isOpenVotingSelected(): boolean {
-        return this.pollTypeControl?.value === PollVisibility.Open || false;
-    }
+    public selectedMethod = computed<string | null>(() => {
+        const preselection = this.form.method_preselection().value();
+        if (!preselection) {
+            return null;
+        }
 
-    public get isNamedVotingSelected(): boolean {
-        return this.pollTypeControl?.value === PollVisibility.Named || false;
-    }
+        return this.form.method_preselection().value().split(`.`)[0];
+    });
 
-    public get isEVotingSelected(): boolean {
-        return this.isEVotingEnabled() && this.pollTypeControl?.value !== PollVisibility.Manually;
-    }
+    public methodForm = computed(() => {
+        switch (this.selectedMethod()) {
+            case `approval`:
+                return this.approvalForm();
+            case `selection`:
+                return this.selectionForm();
+            case `rating_approval`:
+                return this.ratingApprovalForm();
+            case `rating_score`:
+                return this.ratingScoreForm();
+        }
 
-    public get isLiveVotingAvailable(): boolean {
-        return this.isEVotingSelected && (this.isNamedVotingSelected || this.isOpenVotingSelected);
-    }
+        return null;
+    });
 
-    private get pollTypeControl(): AbstractControl {
-        return this.pollForm.get(`visibility`);
-    }
+    public methodConfig = computed<unknown>(() => {
+        if (this.methodForm()) {
+            return this.methodForm().getSerialzedForm();
+        }
 
-    private get liveVotingControl(): AbstractControl {
-        return this.pollForm.get(`live_voting_enabled`);
-    }
+        return null;
+    });
+
+    public isOpenVotingSelected = computed(() => {
+        return this.form.visibility().value() === PollVisibility.Open || false;
+    });
+
+    public isNamedVotingSelected = computed(() => {
+        return this.form.visibility().value() === PollVisibility.Named || false;
+    });
+
+    public isEVotingSelected = computed(() => {
+        return this.isEVotingEnabled() && this.form.visibility().value() !== PollVisibility.Manually;
+    });
+
+    public isLiveVotingAvailable = computed(() => {
+        return this.isEVotingSelected() && (this.isNamedVotingSelected() || this.isOpenVotingSelected());
+    });
 
-    private fb = inject(UntypedFormBuilder);
     public groupRepo = inject(GroupControllerService);
     private dialog = inject(MatDialog);
+    private meetingSettingsService = inject(MeetingSettingsService);
 
     public constructor() {
         super();
-        this.initContentForm();
 
         effect(() => {
-            this.updateData();
+            this.updateLiveVotingEnabled();
+            this.setWarning();
         });
-    }
 
-    public ngOnInit(): void {
-        this.subscriptions.push(
-            combineLatest([
-                this.pollForm.valueChanges.pipe(startWith(``)),
-                this.pollTypeControl.valueChanges.pipe(startWith(``))
-            ]).subscribe(() => {
-                this.updateLiveVotingEnabled();
-                this.setWarning();
-            })
-        );
+        effect(this.updateData.bind(this));
+        effect(this.changeMethod.bind(this));
+
+        this.allowCumulative.set(this.meetingSettingsService.instant(`poll_enable_max_votes_per_option`));
+        let method = this.data()?.config?.method;
+        if (this.data()?.config_id) {
+            const collection = collectionFromFqid(this.data()?.config_id);
+            method = collection.replace(`poll_config_`, ``);
+        }
+        if (method === `rating_score`) {
+            this.allowCumulative.set(true);
+        }
+
+        this.meetingSettingsService
+            .get(`poll_enable_max_votes_per_option`)
+            .pipe(takeUntilDestroyed())
+            .subscribe(v => {
+                this.allowCumulative.set(v);
+            });
     }
 
     public getValues(): Partial<{ [place in keyof ViewPoll]: any }> {
-        return { ...this.data, ...this.serializeForm(this.pollForm) };
+        return { ...this.data, ...this.serializeForm() };
     }
 
     public openVotingWarning(event: MouseEvent): void {
@@ -117,54 +205,63 @@ export class PollFormComponent extends BaseComponent implements OnInit {
     }
 
     public onOptionsChange(items: string[]): void {
-        this.pollForm.get('options').setValue(items);
+        this.form.options().value.set(items);
     }
 
     private updateLiveVotingEnabled(): void {
-        if (!this.isLiveVotingAvailable) {
-            this.liveVotingControl.setValue(false, { emitEvent: false });
+        if (!this.isLiveVotingAvailable()) {
+            this.form.live_voting_enabled().value.set(false);
         }
     }
 
     private setWarning(): void {
-        this.showNonNominalWarning = this.pollTypeControl.value === PollVisibility.Secret;
+        this.showNonNominalWarning = this.pollModel().visibility === PollVisibility.Secret;
     }
 
-    private serializeForm(formGroup: UntypedFormGroup): Partial<ViewPoll> {
+    private serializeForm(): Partial<ViewPoll> {
         // getRawValue() includes disabled controls
-        return { ...formGroup.getRawValue() };
-    }
-
-    private initContentForm(): void {
-        this.pollForm = this.fb.group({
-            title: [``, Validators.required],
-            visibility: [PollVisibility.Open, Validators.required],
-            entitled_group_ids: [],
-            live_voting_enabled: [false],
-            option_type: ['text'],
-            options: [[]]
-        });
+        return { ...this.pollModel() };
     }
 
     private updateData(): void {
         const data = this.data();
-        if (data && this.pollForm) {
+        if (data && this.form) {
             const patch: Record<string, any> = {};
 
-            if (data.entitled_group_ids !== undefined) patch['entitled_group_ids'] = data.entitled_group_ids;
-            if (data.live_voting_enabled !== undefined) patch['live_voting_enabled'] = !!data.live_voting_enabled;
-            if (data.title !== undefined) patch['title'] = data.title;
-            if (data.visibility !== undefined) patch['visibility'] = data.visibility;
+            if (data.entitled_group_ids !== undefined)
+                this.form['entitled_group_ids']().value.set(data.entitled_group_ids);
+            if (data.live_voting_enabled !== undefined)
+                this.form['live_voting_enabled']().value.set(!!data.live_voting_enabled);
+            if (data.title !== undefined) this.form['title']().value.set(data.title);
+            if (data.visibility !== undefined) this.form['visibility']().value.set(data.visibility);
             if (data.options !== undefined && !data.options.some(option => option.meeting_user_id))
-                patch['options'] = data.options.map(option => option.text);
+                this.form['options']().value.set(data.options.map(option => option.text));
             if (data.config?.allow_abstain !== undefined) patch['allow_abstain'] = data.config.allow_abstain;
             if (data.config?.allow_nota !== undefined) patch['allow_nota'] = data.config.allow_nota;
             if (data.config?.strike_out !== undefined) patch['strike_out'] = data.config.strike_out;
             if (data.config?.display_chart !== undefined) patch['display_chart'] = data.config.display_chart;
             if (data.config?.onehundred_percent_base !== undefined)
                 patch['onehundred_percent_base'] = data.config.onehundred_percent_base;
+        }
+    }
+
+    private changeMethod(): void {
+        const configForm = this.methodForm();
+        if (!configForm) {
+            return;
+        }
+
+        const mode = this.form.method_preselection().value().split(`.`)[1];
+        if (this.selectedMethod() === `approval` || this.selectedMethod() === `rating_approval`) {
+            this.methodForm()
+                .form.get(`allow_abstain`)
+                .patchValue(mode === `yes_no_abstain`);
+        }
 
-            this.pollForm.patchValue(patch);
+        if (this.selectedMethod() === `selection`) {
+            this.methodForm()
+                .form.get(`strike_out`)
+                .patchValue(mode === `no`);
         }
     }
 }
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.html b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.html
index 25f16b0ca5..7a35b2e5f9 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.html
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.html
@@ -1,38 +1,19 @@
 <mat-dialog-content>
     <div class="poll-config" [class.hidden]="analogPollFormOpen()">
-        <os-poll-form [data]="pollData" [isEVotingEnabled]="isEVotingEnabled" [optionEdit]="selectedTab() === 0">
-            @if (pollData.isCreated === false) {
-                @switch (this.getSelectedMethod()) {
-                    @case ('approval') {
-                        <os-poll-form-approval [data]="pollData" />
-                    }
-                    @case ('selection') {
-                        <os-poll-form-selection [data]="pollData" [optionAmount]="options.value().length" />
-                    }
-                }
-            } @else {
-                <mat-tab-group [(selectedIndex)]="selectedTab">
-                    <mat-tab [label]="'Selection' | translate">
-                        <div class="tab-content">
-                            <os-poll-form-selection [data]="pollData" [optionAmount]="options.value().length" />
-                        </div>
-                    </mat-tab>
-                    <mat-tab [label]="'Approval' | translate">
-                        <div class="tab-content">
-                            <os-poll-form-approval [data]="pollData" />
-                        </div>
-                    </mat-tab>
-                </mat-tab-group>
-            }
-        </os-poll-form>
+        <os-poll-form
+            [data]="pollData"
+            [isEVotingEnabled]="isEVotingEnabled"
+            [optionAmount]="options().length"
+            [optionEdit]="selectedTab() === 0"
+        ></os-poll-form>
     </div>
 
     @if (analogPollFormOpen()) {
         <div class="poll-result">
             <os-poll-edit-result
-                [configType]="getSelectedMethod()"
+                [configType]="pollForm().selectedMethod()"
                 [options]="analogPollOptions()"
-                [pollConfigData]="getMethodConfig()"
+                [pollConfigData]="pollForm().methodConfig()"
                 [pollData]="pollData"
             />
         </div>
@@ -43,7 +24,7 @@
 <mat-dialog-actions>
     <div class="dialog-actions">
         <div>
-            <button mat-button [disabled]="!formsValid" (click)="submitPoll()">
+            <button mat-button [disabled]="!formsValid()" (click)="submitPoll()">
                 <span>{{ 'Save' | translate }}</span>
             </button>
 
@@ -53,7 +34,7 @@
         </div>
 
         <div>
-            @if (isAnalogPoll.value()) {
+            @if (isAnalogPoll()) {
                 @if (analogPollFormOpen()) {
                     <button mat-button (click)="analogPollFormOpen.set(false)">
                         <span>{{ 'Edit Poll' | translate }}</span>
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.ts
index d82274d3f0..5b0a1bb06e 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.ts
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.ts
@@ -1,6 +1,4 @@
-import { ChangeDetectionStrategy, Component, inject, signal, viewChild } from '@angular/core';
-import { rxResource } from '@angular/core/rxjs-interop';
-import { UntypedFormGroup } from '@angular/forms';
+import { ChangeDetectionStrategy, Component, computed, inject, signal } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatTabsModule } from '@angular/material/tabs';
@@ -13,8 +11,6 @@ import {
 } from '@app/site/pages/meetings/modules/poll/base/base-poll-dialog.component';
 import { PollEditResultComponent } from '@app/site/pages/meetings/modules/poll/components/poll-edit-result/poll-edit-result.component';
 import { PollFormComponent } from '@app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component';
-import { PollFormApprovalComponent } from '@app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component';
-import { PollFormSelectionComponent } from '@app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component';
 import { PollService } from '@app/site/pages/meetings/modules/poll/services/poll.service';
 import { TranslatePipe } from '@ngx-translate/core';
 
@@ -27,8 +23,6 @@ const TAB_METHOD_MAP = [`selection`, `approval`];
     imports: [
         PollEditResultComponent,
         PollFormComponent,
-        PollFormApprovalComponent,
-        PollFormSelectionComponent,
         MatTabsModule,
         MatDialogModule,
         MatButtonModule,
@@ -39,29 +33,14 @@ const TAB_METHOD_MAP = [`selection`, `approval`];
 export class TopicPollDialogComponent extends BasePollDialogComponent {
     public majority: string;
 
-    private approvalForm = viewChild(PollFormApprovalComponent);
-    private selectionPollForm = viewChild.required(PollFormSelectionComponent);
-
     public get isEVotingEnabled(): boolean {
         return this.pollService.isElectronicVotingEnabled;
     }
 
-    public override get formsValid(): boolean {
-        if (!super.formsValid) {
-            return false;
-        }
-
-        return this.getSelectedMethod() === `approval`
-            ? this.approvalForm().form.valid
-            : this.selectionPollForm().form.valid && this.options.value().length > 0;
-    }
-
     public selectedTab = signal(0);
 
-    public options = rxResource<string[], { form: UntypedFormGroup }>({
-        params: () => ({ form: this.pollForm().pollForm }),
-        defaultValue: [],
-        stream: ({ params }) => params.form.get('options').valueChanges
+    public options = computed(() => {
+        return this.pollForm().form.options().value();
     });
 
     private pollService = inject(PollService);
@@ -79,13 +58,13 @@ export class TopicPollDialogComponent extends BasePollDialogComponent {
 
     public override methodPayload(): PollMethodPayload {
         return {
-            method: this.getSelectedMethod(),
-            method_config: this.getMethodConfig()
+            method: this.pollForm().selectedMethod(),
+            method_config: this.pollForm().methodConfig()
         };
     }
 
     public override optionsPayload(): PollOptionsPayload {
-        if (this.getSelectedMethod() === `approval`) {
+        if (this.pollForm().selectedMethod() === `approval`) {
             return {};
         }
 
@@ -98,28 +77,14 @@ export class TopicPollDialogComponent extends BasePollDialogComponent {
 
     public analogPollOptions(): { key: string; title: string }[] {
         const options = [];
-        if (this.getSelectedMethod() === `approval`) {
+        if (this.pollForm().selectedMethod() === `approval`) {
             options.push([{ key: `approval`, title: null }]);
         } else {
-            for (const option of this.options.value()) {
+            for (const option of this.options()) {
                 options.push({ key: `text-${djb2hash(option)}`, title: option });
             }
         }
 
         return options;
     }
-
-    public getMethodConfig(): unknown {
-        switch (this.getSelectedMethod()) {
-            case `approval`:
-                return { ...this.approvalForm()?.getSerialzedForm() };
-            case `selection`:
-                return { ...this.selectionPollForm()?.getSerialzedForm() };
-        }
-        return {};
-    }
-
-    public getSelectedMethod(): string {
-        return TAB_METHOD_MAP[this.selectedTab()];
-    }
 }
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.html b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.html
index fb780f9838..313b073aee 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.html
+++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.html
@@ -1,71 +1,19 @@
 <mat-dialog-content>
     <div class="poll-config" [class.hidden]="analogPollFormOpen()">
-        <os-poll-form [data]="pollData" [isEVotingEnabled]="isEVotingEnabled">
-            @if (pollData.isCreated === false) {
-                @switch (this.getSelectedMethod()) {
-                    @case ('approval') {
-                        <os-poll-form-approval [data]="pollData" />
-                    }
-                    @case ('selection') {
-                        <os-poll-form-selection [data]="pollData" [optionAmount]="optionAmount" />
-                    }
-                    @case ('rating_approval') {
-                        <os-poll-form-rating-approval [data]="pollData" [optionAmount]="optionAmount" />
-                    }
-                    @case ('rating_score') {
-                        <os-poll-form-rating-score [data]="pollData" [optionAmount]="optionAmount" />
-                    }
-                }
-            } @else if (hasMultipleOptions) {
-                <mat-tab-group [(selectedIndex)]="selectedTab">
-                    <mat-tab [label]="'Selection' | translate">
-                        <div class="tab-content">
-                            <os-poll-form-selection [data]="pollData" [optionAmount]="optionAmount" />
-                        </div>
-                    </mat-tab>
-                    <mat-tab [label]="'Approval per candidate' | translate">
-                        <div class="tab-content">
-                            <os-poll-form-rating-approval [data]="pollData" [optionAmount]="optionAmount" />
-                        </div>
-                    </mat-tab>
-                    @if (allowCumulative()) {
-                        <mat-tab [label]="'Cumulative' | translate">
-                            <div class="tab-content">
-                                <os-poll-form-rating-score [data]="pollData" [optionAmount]="optionAmount" />
-                            </div>
-                        </mat-tab>
-                    }
-                    <mat-tab [label]="'List' | translate">
-                        <div class="tab-content">
-                            <os-poll-form-approval [data]="pollData" />
-                        </div>
-                    </mat-tab>
-                </mat-tab-group>
-            } @else if (allowCumulative()) {
-                <mat-tab-group [(selectedIndex)]="selectedTab">
-                    <mat-tab [label]="'Single candidate' | translate">
-                        <div class="tab-content">
-                            <os-poll-form-approval [data]="pollData" />
-                        </div>
-                    </mat-tab>
-                    <mat-tab [label]="'Cumulative' | translate">
-                        <div class="tab-content">
-                            <os-poll-form-rating-score [data]="pollData" [optionAmount]="optionAmount" />
-                        </div>
-                    </mat-tab>
-                </mat-tab-group>
-            } @else {
-                <os-poll-form-approval [data]="pollData" />
-            }
-        </os-poll-form>
+        <os-poll-form
+            optionType="meeting_user"
+            [data]="pollData"
+            [isEVotingEnabled]="isEVotingEnabled"
+            [optionAmount]="optionAmount"
+        ></os-poll-form>
     </div>
 
     @if (analogPollFormOpen()) {
         <div class="poll-result">
             <os-poll-edit-result
-                [configType]="getSelectedMethod()"
+                [configType]="pollForm().selectedMethod()"
                 [options]="analogPollOptions()"
-                [pollConfigData]="getMethodConfig()"
+                [pollConfigData]="pollForm().methodConfig()"
                 [pollData]="pollData"
             />
         </div>
@@ -76,7 +24,7 @@
 <mat-dialog-actions>
     <div class="dialog-actions">
         <div>
-            <button mat-button [disabled]="!formsValid" (click)="submitPoll()">
+            <button mat-button [disabled]="!formsValid()" (click)="submitPoll()">
                 <span>{{ 'Save' | translate }}</span>
             </button>
 
@@ -86,7 +34,7 @@
         </div>
 
         <div>
-            @if (isAnalogPoll.value()) {
+            @if (isAnalogPoll()) {
                 @if (analogPollFormOpen()) {
                     <button mat-button (click)="analogPollFormOpen.set(false)">
                         <span>{{ 'Edit Poll' | translate }}</span>
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.ts
index 8b7cc2d7df..b2c3629222 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.ts
+++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.ts
@@ -1,9 +1,7 @@
-import { ChangeDetectionStrategy, Component, computed, inject, signal, viewChild } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatTabsModule } from '@angular/material/tabs';
-import { collectionFromFqid } from '@app/infrastructure/utils/transform-functions';
 import {
     BasePollDialogComponent,
     PollMethodPayload,
@@ -11,13 +9,8 @@ import {
 } from '@app/site/pages/meetings/modules/poll/base/base-poll-dialog.component';
 import { PollEditResultComponent } from '@app/site/pages/meetings/modules/poll/components/poll-edit-result/poll-edit-result.component';
 import { PollFormComponent } from '@app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component';
-import { PollFormApprovalComponent } from '@app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component';
-import { PollFormRatingApprovalComponent } from '@app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component';
-import { PollFormRatingScoreComponent } from '@app/site/pages/meetings/modules/poll/components/poll-form-rating-score/poll-form-rating-score.component';
-import { PollFormSelectionComponent } from '@app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component';
 import { PollService } from '@app/site/pages/meetings/modules/poll/services/poll.service';
 import { ViewAssignment } from '@app/site/pages/meetings/pages/assignments';
-import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service';
 import { TranslatePipe } from '@ngx-translate/core';
 
 @Component({
@@ -27,10 +20,6 @@ import { TranslatePipe } from '@ngx-translate/core';
     imports: [
         PollEditResultComponent,
         PollFormComponent,
-        PollFormApprovalComponent,
-        PollFormSelectionComponent,
-        PollFormRatingApprovalComponent,
-        PollFormRatingScoreComponent,
         MatDialogModule,
         MatButtonModule,
         MatTabsModule,
@@ -39,52 +28,10 @@ import { TranslatePipe } from '@ngx-translate/core';
     changeDetection: ChangeDetectionStrategy.Eager
 })
 export class AssignmentPollDialogComponent extends BasePollDialogComponent {
-    private approvalForm = viewChild(PollFormApprovalComponent);
-    private selectionForm = viewChild(PollFormSelectionComponent);
-    private ratingApprovalForm = viewChild(PollFormRatingApprovalComponent);
-    private ratingScoreForm = viewChild(PollFormRatingScoreComponent);
-
-    private tabMethodMap = computed(() => {
-        const methods = [];
-        if (!this.hasMultipleOptions) {
-            methods.push(`approval`);
-            if (this.allowCumulative()) {
-                methods.push(`rating_score`);
-            }
-        } else {
-            methods.push(`selection`, `rating_approval`);
-            if (this.allowCumulative()) {
-                methods.push(`rating_score`);
-            }
-            methods.push(`approval`);
-        }
-
-        return methods;
-    });
-
     public get isEVotingEnabled(): boolean {
         return this.pollService.isElectronicVotingEnabled;
     }
 
-    public override get formsValid(): boolean {
-        if (!super.formsValid) {
-            return false;
-        }
-
-        switch (this.getSelectedMethod()) {
-            case `approval`:
-                return this.approvalForm()?.form.valid;
-            case `selection`:
-                return this.selectionForm()?.form.valid;
-            case `rating_approval`:
-                return this.ratingApprovalForm()?.form.valid;
-            case `rating_score`:
-                return this.ratingScoreForm()?.form.valid;
-        }
-
-        return false;
-    }
-
     public get hasMultipleOptions(): boolean {
         const assignment = this.pollData?.content_object as ViewAssignment;
         return assignment.candidates.length > 1;
@@ -96,39 +43,12 @@ export class AssignmentPollDialogComponent extends BasePollDialogComponent {
         return assignment.candidates.length;
     }
 
-    public selectedTab = signal(0);
-    public allowCumulative = signal(false);
-
     private pollService = inject(PollService);
-    private meetingSettingsService = inject(MeetingSettingsService);
-
-    public constructor() {
-        super();
-
-        this.allowCumulative.set(this.meetingSettingsService.instant(`poll_enable_max_votes_per_option`));
-        let method = this.pollData?.config?.method;
-        if (this.pollData?.config_id) {
-            const collection = collectionFromFqid(this.pollData?.config_id);
-            method = collection.replace(`poll_config_`, ``);
-        }
-        if (method === `rating_score`) {
-            this.allowCumulative.set(true);
-        }
-
-        this.selectedTab.set(this.tabMethodMap().indexOf(method));
-
-        this.meetingSettingsService
-            .get(`poll_enable_max_votes_per_option`)
-            .pipe(takeUntilDestroyed())
-            .subscribe(v => {
-                this.allowCumulative.set(v);
-            });
-    }
 
     public override methodPayload(): PollMethodPayload {
         return {
-            method: this.getSelectedMethod(),
-            method_config: this.getMethodConfig()
+            method: this.pollForm().selectedMethod(),
+            method_config: this.pollForm().methodConfig()
         };
     }
 
@@ -145,7 +65,7 @@ export class AssignmentPollDialogComponent extends BasePollDialogComponent {
         const assignment = this.pollData?.content_object as ViewAssignment;
 
         const options = [];
-        if (this.getSelectedMethod() === `approval`) {
+        if (this.pollForm().selectedMethod() === `approval`) {
             options.push([{ key: `approval`, title: null }]);
         } else {
             for (const option of assignment.candidates) {
@@ -155,22 +75,4 @@ export class AssignmentPollDialogComponent extends BasePollDialogComponent {
 
         return options;
     }
-
-    public getMethodConfig(): unknown {
-        switch (this.getSelectedMethod()) {
-            case `approval`:
-                return { ...this.approvalForm()?.getSerialzedForm() };
-            case `selection`:
-                return { ...this.selectionForm()?.getSerialzedForm() };
-            case `rating_approval`:
-                return { ...this.ratingApprovalForm()?.getSerialzedForm() };
-            case `rating_score`:
-                return { ...this.ratingScoreForm()?.getSerialzedForm() };
-        }
-        return {};
-    }
-
-    public getSelectedMethod(): string {
-        return this.tabMethodMap()[this.selectedTab()];
-    }
 }
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.html b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.html
index 19f7df527d..9ef0e48e7d 100644
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.html
+++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.html
@@ -1,6 +1,6 @@
 <mat-dialog-content>
     <div class="poll-config" [class.hidden]="analogPollFormOpen()">
-        <os-poll-form [data]="pollData" [isEVotingEnabled]="isEVotingEnabled">
+        <os-poll-form [customConfigForm]="true" [data]="pollData" [isEVotingEnabled]="isEVotingEnabled">
             <os-poll-form-approval [data]="pollData" />
         </os-poll-form>
     </div>
@@ -20,7 +20,7 @@
 <mat-dialog-actions>
     <div class="dialog-actions">
         <div>
-            <button mat-button [disabled]="!formsValid" (click)="submitPoll()">
+            <button mat-button [disabled]="!formsValid() && !approvalFormValid()" (click)="submitPoll()">
                 <span>{{ 'Save' | translate }}</span>
             </button>
 
@@ -30,7 +30,7 @@
         </div>
 
         <div>
-            @if (isAnalogPoll.value()) {
+            @if (isAnalogPoll()) {
                 @if (analogPollFormOpen()) {
                     <button mat-button (click)="analogPollFormOpen.set(false)">
                         <span>{{ 'Edit Poll' | translate }}</span>
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.ts
index d35f3389d8..cfe35802f5 100644
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.ts
@@ -1,4 +1,4 @@
-import { Component, inject, viewChild } from '@angular/core';
+import { Component, computed, inject, viewChild } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDialogModule } from '@angular/material/dialog';
 import { PollConfigApproval } from '@app/domain/models/poll/poll-config-approval';
@@ -33,13 +33,9 @@ export class MotionPollDialogComponent extends BasePollDialogComponent {
         return this.pollService.isElectronicVotingEnabled;
     }
 
-    public override get formsValid(): boolean {
-        if (!super.formsValid) {
-            return false;
-        }
-
+    public approvalFormValid = computed(() => {
         return this.approvalForm().form.valid;
-    }
+    });
 
     public get approvalFormValue(): Partial<PollConfigApproval> {
         return this.approvalForm().form.value;