diff --git a/client/src/app/site/motions/components/motion-detail/motion-detail.component.html b/client/src/app/site/motions/components/motion-detail/motion-detail.component.html
index 1cf555806..7331a681a 100644
--- a/client/src/app/site/motions/components/motion-detail/motion-detail.component.html
+++ b/client/src/app/site/motions/components/motion-detail/motion-detail.component.html
@@ -222,12 +222,14 @@
                 <button *ngFor="let state of motion.nextStates" mat-menu-item (click)="setState(state.id)">
                     {{ state.name | translate }} <span *ngIf="state.show_state_extension_field">&nbsp;...</span>
                 </button>
-                <mat-divider></mat-divider>
-                <button mat-menu-item (click)="setState(null)" *ngIf="perms.isAllowed('change_metadata', motion)">
-                    <mat-icon>replay</mat-icon> {{ 'Reset state' | translate }}
-                </button>
+                <div *ngIf="perms.isAllowed('change_metadata', motion)">
+                    <mat-divider *ngIf="motion.nextStates.length > 0"></mat-divider>
+                    <button mat-menu-item (click)="setState(null)">
+                        <mat-icon>replay</mat-icon> {{ 'Reset state' | translate }}
+                    </button>
+                </div>
             </mat-menu>
-            <div *ngIf="perms.isAllowed('change_metadata', motion)">
+            <div *ngIf="perms.isAllowed('change_state', motion)">
                 <mat-basic-chip [matMenuTriggerFor]="stateMenu" [ngClass]="getStateCssColor()">
                     {{ stateLabel }}
                 </mat-basic-chip>
@@ -238,7 +240,7 @@
                     <button mat-icon-button (click)="setStateExtension()"><mat-icon>check</mat-icon></button>
                 </div>
             </div>
-            <div *ngIf="!perms.isAllowed('change_metadata', motion)">
+            <div *ngIf="!perms.isAllowed('change_state', motion)">
                 <mat-basic-chip [ngClass]="getStateCssColor()"> {{ stateLabel }} </mat-basic-chip>
             </div>
         </div>
diff --git a/client/src/app/site/motions/services/local-permissions.service.ts b/client/src/app/site/motions/services/local-permissions.service.ts
index 078c10381..e6d1cbacb 100644
--- a/client/src/app/site/motions/services/local-permissions.service.ts
+++ b/client/src/app/site/motions/services/local-permissions.service.ts
@@ -108,6 +108,20 @@ export class LocalPermissionsService {
                     motion.state.allow_submitter_edit &&
                     motion.submitters.some(submitter => submitter.id === this.operator.user.id)
                 );
+            case 'change_state':
+                // check also for empty ViewMotion object (e.g. if motion.id is null)
+                // important for creating new motion as normal user
+                if (!motion || !motion.id) {
+                    return false;
+                }
+                return (
+                    this.operator.hasPerms('motions.can_manage') ||
+                    this.operator.hasPerms('motions.can_manage_metadata') ||
+                    (motion.state &&
+                        motion.state.allow_submitter_edit &&
+                        motion.submitters &&
+                        motion.submitters.some(submitter => submitter.id === this.operator.user.id))
+                );
             case 'change_metadata':
                 return (
                     this.operator.hasPerms('motions.can_manage') ||