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 81f2cbbb5..e3ff5652c 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
@@ -1,5 +1,5 @@
 <os-head-bar
-    [mainButton]="perms.isAllowed('update_motion', motion)"
+    [mainButton]="perms.isAllowed('update', motion)"
     mainButtonIcon="edit"
     [nav]="false"
     [editMode]="editMotion"
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 c239ccfcc..fcffea60b 100644
--- a/client/src/app/site/motions/services/local-permissions.service.ts
+++ b/client/src/app/site/motions/services/local-permissions.service.ts
@@ -82,9 +82,10 @@ export class LocalPermissionsService {
                     return false;
                 }
                 return (
-                    this.operator.hasPerms('motions.can_manage') &&
-                    motion.state.allow_submitter_edit &&
-                    motion.submitters.some(submitter => submitter.id === this.operator.user.id)
+                    this.operator.hasPerms('motions.can_manage') ||
+                    (motion.state.allow_submitter_edit &&
+                        motion.submitters &&
+                        motion.submitters.some(submitter => submitter.id === this.operator.user.id))
                 );
             case 'update_submitters':
                 return this.operator.hasPerms('motions.can_manage');