diff --git a/src/Squidex/app/features/settings/declarations.ts b/src/Squidex/app/features/settings/declarations.ts
index 17e095257..a6f8916c6 100644
--- a/src/Squidex/app/features/settings/declarations.ts
+++ b/src/Squidex/app/features/settings/declarations.ts
@@ -19,6 +19,7 @@ export * from './pages/plans/plans-page.component';
 export * from './pages/roles/role.component';
 export * from './pages/roles/roles-page.component';
 export * from './pages/workflows/workflow-step.component';
+export * from './pages/workflows/workflow-transition.component';
 export * from './pages/workflows/workflows-page.component';
 
 export * from './settings-area.component';
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/module.ts b/src/Squidex/app/features/settings/module.ts
index 29802f591..a0b8214be 100644
--- a/src/Squidex/app/features/settings/module.ts
+++ b/src/Squidex/app/features/settings/module.ts
@@ -32,7 +32,8 @@ import {
     RolesPageComponent,
     SettingsAreaComponent,
     WorkflowsPageComponent,
-    WorkflowStepComponent
+    WorkflowStepComponent,
+    WorkflowTransitionComponent
 } from './declarations';
 
 const routes: Routes = [
@@ -204,6 +205,7 @@ const routes: Routes = [
         RolesPageComponent,
         SettingsAreaComponent,
         WorkflowsPageComponent,
+        WorkflowTransitionComponent,
         WorkflowStepComponent
     ]
 })
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.html b/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.html
index 113668ae0..7da30a5b5 100644
--- a/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.html
+++ b/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.html
@@ -25,53 +25,40 @@
         </div>
     </div>
         
-    <div class="row transition no-gutters" *ngFor="let transition of transitions">
-        <div class="col-auto">
-            <i class="icon-arrow-right text-decent"></i>
-        </div>
-        <div class="col col-step">
-            <div class="transition-to">
-                <div class="color-circle" [style.background]="transition.step.color"></div> {{transition.to}}
+    <div class="step-inner">
+        <sqx-workflow-transition *ngFor="let transition of transitions; trackBy: trackByTransition" 
+            [transition]="transition"
+            [roles]="roles"
+            (remove)="transitionRemove.emit(transition)"
+            (update)="changeTransition(transition, $event)">
+        </sqx-workflow-transition>
+            
+        <div class="row transition no-gutters" *ngIf="openSteps.length > 0">
+            <div class="col-auto">
+                <i class="icon-arrow-right text-decent"></i>
+            </div>
+            <div class="col col-step">
+                <sqx-dropdown [items]="openSteps" [(ngModel)]="openStep">
+                    <ng-template let-target="$implicit">
+                        <div class="color-circle" [style.background]="target.color"></div> {{target.name}}
+                    </ng-template>
+                </sqx-dropdown>
+            </div>
+            <div class="col pl-2">
+                <button class="btn btn-outline-secondary" (click)="transitionAdd.emit(openStep)">
+                    <i class="icon-plus"></i>
+                </button>
             </div>
         </div>
-        <div class="col-auto col-label">
-            <span class="text-decent">when</span>
-        </div>
-        <div class="col">
-            <button class="btn btn-block btn-outline-secondary dashed">
-                Add Expression
-            </button>
-        </div>
-        <div class="col-auto col-label">
-            <span class="text-decent">for</span>
-        </div>
-        <div class="col">
-            <button class="btn btn-block btn-outline-secondary dashed">
-                Add Role
-            </button>
-        </div>
-        <div class="col-auto pl-2">
-            <button type="button" class="btn btn-text-danger" (click)="transitionRemove.emit(transition)">
-                <i class="icon-bin2"></i>
-            </button>
-        </div>
-    </div>
-        
-    <div class="row transition no-gutters" *ngIf="openSteps.length > 0">
-        <div class="col-auto">
-            <i class="icon-arrow-right text-decent"></i>
-        </div>
-        <div class="col col-step">
-            <sqx-dropdown [items]="openSteps" [(ngModel)]="openStep">
-                <ng-template let-target="$implicit">
-                    <div class="color-circle" [style.background]="target.color"></div> {{target.name}}
-                </ng-template>
-            </sqx-dropdown>
-        </div>
-        <div class="col pl-2">
-            <button class="btn btn-outline-secondary" (click)="transitionAdd.emit(openStep)">
-                <i class="icon-plus"></i>
-            </button>
-        </div>
+
+        <div class="form-check">
+            <input class="form-check-input" type="checkbox" id="preventUpdates_{{step.name}}"
+                [ngModel]="step.noUpdate"
+                (ngModelChange)="changeNoUpdate($event)" />
+
+            <label class="form-check-label" for="preventUpdates_{{step.name}}">
+                Prevent updates
+            </label>
+        </div> 
     </div>
 </div>
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.scss b/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.scss
index c266d2fe5..2c81bc704 100644
--- a/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.scss
+++ b/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.scss
@@ -1,48 +1,49 @@
 @import '_vars';
 @import '_mixins';
 
-.color {
-    line-height: 2.8rem;
-}
+:host ::ng-deep {
+    .color {
+        line-height: 2.8rem;
+    }
 
-.color-circle {
-    @include circle(12px);
-    border: 1px solid $color-border-dark;
-    background: $color-border;
-    display: inline-block;
-}
+    .color-circle {
+        @include circle(12px);
+        border: 1px solid $color-border-dark;
+        background: $color-border;
+        display: inline-block;
+    }
 
-.dashed {
-    border-style: dashed;
-}
+    .col-label {
+        padding: 0 .5rem;
+    }
 
-.transition {
-    & {
-        padding-left: 1rem;
-        margin-top: .25rem;
-        margin-bottom: .5rem;
-        line-height: 2.2rem;
+    .col-step {
+        min-width: 10rem;
+        max-width: 10rem;
+        padding-left: .5rem;
     }
 
-    &-to {
-        padding: .5rem .75rem;
-        padding-right: 0;
-        line-height: 1.2rem;
+    .transition {
+        & {
+            margin-top: .25rem;
+            margin-bottom: .5rem;
+            line-height: 2.2rem;
+        }
+
+        &-to {
+            padding: .5rem .75rem;
+            padding-right: 0;
+            line-height: 1.2rem;
+        }
     }
 }
-
 .step {
     & {
         margin-bottom: 1rem;
     }
-}
 
-.col-label {
-    padding: 0 .5rem;
-}
+    &-inner {
+        padding-left: 1rem;
+    }
 
-.col-step {
-    min-width: 10rem;
-    max-width: 10rem;
-    padding-left: .5rem;
 }
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.ts b/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.ts
index afbb45169..ebb5b79f8 100644
--- a/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.ts
+++ b/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.ts
@@ -8,10 +8,12 @@
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
 
 import {
+    RoleDto,
     WorkflowDto,
     WorkflowStep,
     WorkflowStepValues,
     WorkflowTransition,
+    WorkflowTransitionValues,
     WorkflowTransitionView
 } from '@app/shared';
 
@@ -27,12 +29,18 @@ export class WorkflowStepComponent implements OnChanges {
     @Input()
     public step: WorkflowStep;
 
+    @Input()
+    public roles: RoleDto[];
+
     @Output()
     public transitionAdd = new EventEmitter<WorkflowStep>();
 
     @Output()
     public transitionRemove = new EventEmitter<WorkflowTransition>();
 
+    @Output()
+    public transitionUpdate = new EventEmitter<{ transition: WorkflowTransition, values: WorkflowTransitionValues }>();
+
     @Output()
     public update = new EventEmitter<WorkflowStepValues>();
 
@@ -58,6 +66,10 @@ export class WorkflowStepComponent implements OnChanges {
         }
     }
 
+    public changeTransition(transition: WorkflowTransition, values: WorkflowTransitionValues) {
+        this.transitionUpdate.emit({ transition, values });
+    }
+
     public changeName(name: string) {
         this.rename.emit(name);
     }
@@ -65,5 +77,13 @@ export class WorkflowStepComponent implements OnChanges {
     public changeColor(color: string) {
         this.update.emit({ color });
     }
+
+    public changeNoUpdate(noUpdate: boolean) {
+        this.update.emit({ noUpdate });
+    }
+
+    public trackByTransition(index: number, transition: WorkflowTransition) {
+        return transition.to;
+    }
 }
 
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.html b/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.html
new file mode 100644
index 000000000..c69109c4a
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.html
@@ -0,0 +1,52 @@
+<div class="row transition no-gutters">
+    <div class="col-auto">
+        <i class="icon-arrow-right text-decent"></i>
+    </div>
+    <div class="col col-step">
+        <div class="transition-to">
+            <div class="color-circle" [style.background]="transition.step.color"></div> {{transition.to}}
+        </div>
+    </div>
+    <div class="col-auto col-label">
+        <span class="text-decent">when</span>
+    </div>
+    <div class="col">
+        <ng-container *ngIf="elementsActive['expression']; else noExpression">
+            <input class="form-control" sqxFocusOnInit (focus)="focusElement('expression')" (blur)="blurElement('expression')" spellcheck="false"
+                [ngModelOptions]="onBlur"
+                [ngModel]="transition.expression"
+                (ngModelChange)="changeExpression($event)" /> 
+        </ng-container>
+
+        <ng-template #noExpression>
+            <button class="btn btn-block btn-outline-secondary dashed" (click)="showElement('expression')">
+                Add Expression
+            </button>
+        </ng-template>
+    </div>
+    <div class="col-auto col-label">
+        <span class="text-decent">for</span>
+    </div>
+    <div class="col">
+        <ng-container *ngIf="elementsActive['role']; else noRole">
+            <select class="form-control" sqxFocusOnInit (focus)="focusElement('role')" (blur)="blurElement('role')" 
+                [ngModelOptions]="onBlur"
+                [ngModel]="transition.role"
+                (ngModelChange)="changeRole($event)">
+                <option *ngFor="let role of roles; trackBy: trackByRole" [ngValue]="role.name">{{role.name}}</option>
+                <option [ngValue]="null">- All Roles -</option>
+            </select>
+        </ng-container>
+
+        <ng-template #noRole>
+            <button class="btn btn-block btn-outline-secondary dashed" (click)="showElement('role')">
+                Add Role
+            </button>
+        </ng-template>
+    </div>
+    <div class="col-auto pl-2">
+        <button type="button" class="btn btn-text-danger" (click)="remove.emit()">
+            <i class="icon-bin2"></i>
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.scss b/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.scss
new file mode 100644
index 000000000..768bb4358
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.scss
@@ -0,0 +1,6 @@
+@import '_vars';
+@import '_mixins';
+
+.dashed {
+    border-style: dashed;
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.ts b/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.ts
new file mode 100644
index 000000000..83bc18aea
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.ts
@@ -0,0 +1,84 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
+ */
+
+import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
+
+import {
+    RoleDto,
+    WorkflowTransitionValues,
+    WorkflowTransitionView
+} from '@app/shared';
+
+@Component({
+    selector: 'sqx-workflow-transition',
+    styleUrls: ['./workflow-transition.component.scss'],
+    templateUrl: './workflow-transition.component.html'
+})
+export class WorkflowTransitionComponent implements OnChanges {
+    @Input()
+    public transition: WorkflowTransitionView;
+
+    @Input()
+    public roles: RoleDto[];
+
+    @Output()
+    public update = new EventEmitter<WorkflowTransitionValues>();
+
+    @Output()
+    public remove = new EventEmitter();
+
+    public elementsActive: { [name: string]: boolean } = {};
+    public elementsFocused: { [name: string]: boolean } = {};
+    public elementsValid: { [name: string]: boolean } = {};
+
+    public onBlur = { updateOn: 'blur' };
+
+    public ngOnChanges(changes: SimpleChanges) {
+        if (changes['transition']) {
+            if (this.transition.expression) {
+                this.elementsValid['expression'] = true;
+                this.elementsActive['expression'] = true;
+            }
+
+            if (this.transition.role) {
+                this.elementsValid['role'] = true;
+                this.elementsActive['role'] = true;
+            }
+        }
+    }
+
+    public changeExpression(expression: string) {
+        this.update.emit({ expression });
+    }
+
+    public changeRole(role: string) {
+        this.update.emit({ role });
+    }
+
+    public showElement(name: string) {
+        this.elementsActive[name] = true;
+    }
+
+    public focusElement(name: string) {
+        this.elementsFocused[name] = true;
+    }
+
+    public blurElement(name: string) {
+        this.elementsFocused[name] = false;
+
+        setTimeout(() => {
+            if (!this.elementsFocused[name] && !this.elementsValid[name]) {
+                this.elementsActive[name] = false;
+             }
+        }, 2000);
+    }
+
+    public trackByRole(index: number, role: RoleDto) {
+        return role.name;
+    }
+}
+
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.html b/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.html
index c5782052b..9ce5b1278 100644
--- a/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.html
+++ b/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.html
@@ -20,15 +20,19 @@
     </ng-container>
 
     <ng-container content>
-        <sqx-workflow-step *ngFor="let step of workflow.steps; trackBy: trackByStep"
-            [workflow]="workflow"
-            [step]="step"
-            (rename)="renameStep(step, $event)"
-            (remove)="removeStep(step)"
-            (transitionAdd)="addTransiton(step, $event)"
-            (transitionRemove)="removeTransition(step, $event)"
-            (update)="updateStep(step, $event)">
-        </sqx-workflow-step>
+        <ng-container *ngIf="rolesState.roles | async; let roles">
+            <sqx-workflow-step *ngFor="let step of workflow.steps; trackBy: trackByStep"
+                [workflow]="workflow"
+                [step]="step"
+                [roles]="roles"
+                (rename)="renameStep(step, $event)"
+                (remove)="removeStep(step)"
+                (transitionAdd)="addTransiton(step, $event)"
+                (transitionRemove)="removeTransition(step, $event)"
+                (transitionUpdate)="updateTransition($event)"
+                (update)="updateStep(step, $event)">
+            </sqx-workflow-step>
+        </ng-container>
 
         <button class="btn btn-success" (click)="addStep()">
             Add Step
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.ts b/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.ts
index 75b83621b..6078fd388 100644
--- a/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.ts
@@ -9,10 +9,12 @@ import { Component, OnInit } from '@angular/core';
 
 import {
     MathHelper,
+    RolesState,
     WorkflowDto,
     WorkflowStep,
     WorkflowStepValues,
-    WorkflowTransition
+    WorkflowTransition,
+    WorkflowTransitionValues
 } from '@app/shared';
 
 @Component({
@@ -25,8 +27,24 @@ export class WorkflowsPageComponent implements OnInit {
 
     public workflow: WorkflowDto;
 
+    constructor(
+        public readonly rolesState: RolesState
+    ) {
+    }
+
     public ngOnInit() {
-        this.workflow = new WorkflowDto().setStep('Published', { color: 'green', isLocked: true });
+        this.rolesState.load();
+
+        this.workflow =
+            new WorkflowDto()
+                .setStep('Archived', { color: '#eb3142', noUpdate: true })
+                .setStep('Draft', { color: '#8091a5' })
+                .setStep('Published', { color: '#4bb958', isLocked: true })
+                .setTransition('Archived', 'Draft')
+                .setTransition('Draft', 'Archived')
+                .setTransition('Draft', 'Published')
+                .setTransition('Published', 'Draft')
+                .setTransition('Published', 'Archived');
     }
 
     public reload() {
@@ -51,6 +69,10 @@ export class WorkflowsPageComponent implements OnInit {
         this.workflow = this.workflow.removeTransition(from.name, transition.to);
     }
 
+    public updateTransition(update: { transition: WorkflowTransition, values: WorkflowTransitionValues }) {
+        this.workflow = this.workflow.setTransition(update.transition.from, update.transition.to, update.values);
+    }
+
     public updateStep(step: WorkflowStep, values: WorkflowStepValues) {
         this.workflow = this.workflow.setStep(step.name, values);
     }
diff --git a/src/Squidex/app/framework/angular/forms/focus-on-init.directive.ts b/src/Squidex/app/framework/angular/forms/focus-on-init.directive.ts
index 954888fb4..84addb85e 100644
--- a/src/Squidex/app/framework/angular/forms/focus-on-init.directive.ts
+++ b/src/Squidex/app/framework/angular/forms/focus-on-init.directive.ts
@@ -17,7 +17,7 @@ export class FocusOnInitDirective implements AfterViewInit {
     public select: boolean;
 
     constructor(
-        private readonly element: ElementRef
+        private readonly element: ElementRef<HTMLElement>
     ) {
     }
 
@@ -28,8 +28,10 @@ export class FocusOnInitDirective implements AfterViewInit {
             }
 
             if (this.select) {
-                if (Types.isFunction(this.element.nativeElement.select)) {
-                    this.element.nativeElement.select();
+                const input: HTMLInputElement = <any>this.element.nativeElement;
+
+                if (Types.isFunction(input.select)) {
+                    input.select();
                 }
             }
         }, 100);
diff --git a/src/Squidex/app/shared/services/workflows.service.ts b/src/Squidex/app/shared/services/workflows.service.ts
index f5a98ba83..d1b659fcc 100644
--- a/src/Squidex/app/shared/services/workflows.service.ts
+++ b/src/Squidex/app/shared/services/workflows.service.ts
@@ -26,6 +26,8 @@ export class WorkflowDto extends Model<WorkflowDto> {
 
     public onCloned() {
         this.steps.sort((a, b) => compareStringsAsc(a.name, b.name));
+
+        this.transitions.sort((a, b) => compareStringsAsc(a.to, b.to));
     }
 
     public getOpenSteps(step: WorkflowStep) {
@@ -41,7 +43,19 @@ export class WorkflowDto extends Model<WorkflowDto> {
     }
 
     public setStep(name: string, values: Partial<WorkflowStepValues>) {
-        const steps = [...this.steps.filter(s => s.name !== name), { name, ...values }];
+        const found = this.getStep(name);
+
+        if (found) {
+            const { name: _, ...existing } = found;
+
+            if (found.isLocked) {
+                return this;
+            }
+
+            values = { ...values, ...existing };
+        }
+
+        const steps = [...this.steps.filter(s => s !== found), { name, ...values }];
 
         return this.with({ steps });
     }
@@ -93,29 +107,37 @@ export class WorkflowDto extends Model<WorkflowDto> {
         return this.with({ transitions });
     }
 
-    public setTransition(from: string, to: string, values: Partial<WorkflowTransitionValues>) {
-        const stepFrom = this.steps.find(s => s.name === from);
+    public setTransition(from: string, to: string, values?: Partial<WorkflowTransitionValues>) {
+        const stepFrom = this.getStep(from);
 
         if (!stepFrom) {
             return this;
         }
 
-        const stepTo = this.steps.find(s => s.name === to);
+        const stepTo = this.getStep(to);
 
         if (!stepTo) {
             return this;
         }
 
-        const transitions = [...this.transitions.filter(t => t.from  !== from || t.to !== to), { from, to, ...values }];
+        const found = this.transitions.find(x => x.from === from && x.to === to);
+
+        if (found) {
+            const { from: _, to: __, ...existing } = found;
+
+            values = { ...values, ...existing };
+        }
+
+        const transitions = [...this.transitions.filter(t => t !== found), { from, to, ...values }];
 
         return this.with({ transitions });
     }
 }
 
-export type WorkflowStepValues = { color?: string; isLocked?: boolean; };
+export type WorkflowStepValues = { color?: string; isLocked?: boolean; noUpdate?: boolean; };
 export type WorkflowStep = { name: string } & WorkflowStepValues;
 
-export type WorkflowTransitionValues = { expression?: string };
+export type WorkflowTransitionValues = { expression?: string; role?: string; };
 export type WorkflowTransition = { from: string; to: string } & WorkflowTransitionValues;
 
 export type WorkflowTransitionView = { step: WorkflowStep } & WorkflowTransition;
\ No newline at end of file