diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index b81d3a141..d310480a4 100755
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -307,10 +307,12 @@ if (!empty($event['Attribute'])):?>
 					<td class="short highlight2"></td>
 					<td class="short action-links highlight2">
 					<?php
-						if (($event['Event']['org'] == $me['org'] && $mayPublish) || $isSiteAdmin) {
+						if (($event['Event']['orgc'] == $me['org'] && $mayModify) || $isSiteAdmin) {
 							echo $this->Html->link('', array('controller' => 'shadow_attributes', 'action' => 'accept', $shadowAttribute['id']), array('class' => 'icon-ok', 'title' => 'Accept'));
 						}
-						echo $this->Form->postLink('', array('controller' => 'shadow_attributes', 'action' => 'discard', $shadowAttribute['id']), array('class' => 'icon-trash', 'title' => 'Discard'), 'Are you sure you want to discard this proposal?');
+						if (($event['Event']['orgc'] == $me['org'] && $mayModify) || $isSiteAdmin || ($shadowAttribute['org'] == $me['org'])) {
+							echo $this->Form->postLink('', array('controller' => 'shadow_attributes', 'action' => 'discard', $shadowAttribute['id']), array('class' => 'icon-trash', 'title' => 'Discard'), 'Are you sure you want to discard this proposal?');
+						}
 					?>
 					</td>
 				</tr>
@@ -384,10 +386,12 @@ if (!empty($event['Attribute'])):?>
 									<td class="short highlight2"></td>
 									<td class="short action-links highlight2">
 									<?php
-										if (($event['Event']['org'] == $me['org'] && $mayPublish) || $isSiteAdmin) {
+										if (($event['Event']['orgc'] == $me['org'] && $mayModify) || $isSiteAdmin) {
 											echo $this->Html->link('', array('controller' => 'shadow_attributes', 'action' => 'accept', $remain['id']), array('class' => 'icon-ok', 'title' => 'Accept'));
 										}
-										echo $this->Form->postLink('', array('controller' => 'shadow_attributes', 'action' => 'discard', $remain['id']), array('class' => 'icon-trash', 'title' => 'Discard'), 'Are you sure you want to discard this proposal?');
+										if (($event['Event']['orgc'] == $me['org'] && $mayModify) || $isSiteAdmin || ($remain['org'] == $me['org'])) {
+											echo $this->Form->postLink('', array('controller' => 'shadow_attributes', 'action' => 'discard', $remain['id']), array('class' => 'icon-trash', 'title' => 'Discard'), 'Are you sure you want to discard this proposal?');
+										}
 									?>
 								</td>
 							</tr>