diff --git a/addressbook/templates/default/view.tpl b/addressbook/templates/default/view.tpl
index bdfebf0b94..b0aa47de54 100644
--- a/addressbook/templates/default/view.tpl
+++ b/addressbook/templates/default/view.tpl
@@ -11,8 +11,10 @@
   <TR> 
    <TD align="left">
      {edit_link}
+     <input type="submit" name="edit" value="{lang_edit}">
+    </form>
    </TD>
-   <TD align=left>
+   <TD align="left">
      {copy_link}
      <input type="hidden" name="sort" value="{sort}">
      <input type="hidden" name="order" value="{order}">
@@ -22,7 +24,7 @@
      <input type="submit" name="submit" value="{lang_copy}">
     </form>
    </TD>
-   <TD align=left>
+   <TD align="left">
      {vcard_link}
      <input type="hidden" name="ab_id" value="{ab_id}">
      <input type="hidden" name="sort" value="{sort}">
diff --git a/addressbook/view.php b/addressbook/view.php
index 1e59eec201..44b00ccd6f 100755
--- a/addressbook/view.php
+++ b/addressbook/view.php
@@ -99,7 +99,14 @@
 		. $access_link . '</b></td><td></table>';
 
 	$sfields = rawurlencode(serialize($fields[0]));
-	$editlink  = $phpgw->common->check_owner($record_owner,"/addressbook/edit.php",lang("edit"),"ab_id=" . $ab_id . "&start=".$start."&sort=".$sort."&order=".$order);
+
+	if ($rights & PHPGW_ACL_EDIT) {
+		$editlink = '<form method="POST" action="'.$phpgw->link("/addressbook/edit.php","ab_id=$ab_id&start=$start&sort=$sort&order=$order"
+			. "&query=$query&sort=$sort").'">';
+	} else {
+		$editlink = '';
+	}
+
 	$copylink  = '<form method="POST" action="'.$phpgw->link("/addressbook/add.php","order=$order&start=$start&filter=$filter&query=$query&sort=$sort").'">';
 	$vcardlink = '<form method="POST" action="'.$phpgw->link("/addressbook/vcardout.php","ab_id=$ab_id&order=$order&start=$start&filter=$filter&query=$query&sort=$sort").'">';
 	$donelink  = '<form method="POST" action="'.$phpgw->link("/addressbook/index.php","order=$order&start=$start&filter=$filter&query=$query&sort=$sort").'">';