diff --git a/addressbook/add.php b/addressbook/add.php
index e571c4d6ba..ea5d9fb65d 100755
--- a/addressbook/add.php
+++ b/addressbook/add.php
@@ -79,7 +79,7 @@
 		$fields = addressbook_read_last_entry($qfields);
 		$newid = $fields[0]['id'];
 		Header("Location: "
-			. $phpgw->link('/addressbook/edit.php',"&ab_id=$newid&order=$order&sort=$sort&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
+			. $phpgw->link('/addressbook/edit.php',"ab_id=$newid&order=$order&sort=$sort&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
 	} else {
 		if (! $bday_month && ! $bday_day && ! $bday_year) {
 			$bday = "";
diff --git a/addressbook/inc/functions.inc.php b/addressbook/inc/functions.inc.php
index 339fe44374..b5c399981d 100755
--- a/addressbook/inc/functions.inc.php
+++ b/addressbook/inc/functions.inc.php
@@ -429,7 +429,7 @@
 		}
 
 		if ($action) {
-			echo "<FORM action=\"".$phpgw->link('/addressbook/' . $action.'?referer='.urlencode($referer))."\" method=\"post\">\n";
+			echo '<FORM action="' . $phpgw->link('/addressbook/' . $action, 'referer='.urlencode($referer)).'" method="post">';
 		}
 
 		if (! ereg("^http://",$url)) {