diff --git a/addressbook/edit.php b/addressbook/edit.php
index 82fa9631ed..9d6c20c3aa 100755
--- a/addressbook/edit.php
+++ b/addressbook/edit.php
@@ -50,7 +50,6 @@
 	}
 
 	// Read in user custom fields, if any
-	$phpgw->preferences->read_repository();
 	$customfields = array();
 	while (list($col,$descr) = @each($phpgw_info["user"]["preferences"]["addressbook"])) {
 		if ( substr($col,0,6) == 'extra_' ) {
@@ -70,7 +69,7 @@
 
 		$qfields = $this->stock_contact_fields + $extrafields + $customfields;
 		$fields = addressbook_read_entry($ab_id,$qfields);
-		addressbook_form("","edit.php","Edit",$fields[0],$customfields);
+		addressbook_form("edit","edit.php","Edit",$fields[0],$customfields);
 	} else {
 		if ($url == "http://") {
 			$url = "";
diff --git a/addressbook/inc/functions.inc.php b/addressbook/inc/functions.inc.php
index 2507f4e317..71bceb3513 100755
--- a/addressbook/inc/functions.inc.php
+++ b/addressbook/inc/functions.inc.php
@@ -484,14 +484,17 @@
 
 		$birthday = $phpgw->common->dateformatorder($bday_year,$bday_month,$bday_day)
 					. '<font face="'.$theme["font"].'" size="-2">(e.g. 1969)</font>';
-
-		if ($format == "view")
-			$create .= '<tr><td><font size="-1">'.lang("Created by").':</font></td>'
-					. '<td colspan="3"><font size="-1">'
-					. grab_owner_name($fields["owner"]);
+		if ($format == 'edit')
+		{
+			$create .= '<tr><td><font size="-1">' . lang("Created by") . ':</font></td>'
+				. '<td colspan="3"><font size="-1">'
+				. $phpgw->common->grab_owner_name($fields["owner"]);
+		}
 		else
-			$create = '';
-  
+		{
+			$create .= '';
+		}
+ 
 		$t->set_var("lang_home",lang("Home"));
 		$t->set_var("lang_business",lang("Business"));
 		$t->set_var("lang_personal",lang("Personal"));
diff --git a/addressbook/templates/default/form.tpl b/addressbook/templates/default/form.tpl
index ce5a711b2c..d480c0f732 100755
--- a/addressbook/templates/default/form.tpl
+++ b/addressbook/templates/default/form.tpl
@@ -298,14 +298,6 @@
     <td></td>
     <td colspan="4"><font size="-1"></font></td>
   </tr>
-  <tr>
-  <!-- BEGIN creator -->
-  {create}
-  <!-- END creator -->
-    <td colspan="3">
-      <font size="-1">
-    </td>
-  </tr>
   <tr>
     <td><font size="-1">{lang_notes}:</font></td>
     <td colspan="3">
@@ -331,5 +323,13 @@
 	<td></td>
   </tr>
 {custom}
+  <tr>
+  <!-- BEGIN creator -->
+  {create}
+  <!-- END creator -->
+    <td colspan="3">
+      <font size="-1">
+    </td>
+  </tr>
 </table>
 <!-- END addressbook entry form -->
diff --git a/addressbook/templates/idsociety/form.tpl b/addressbook/templates/idsociety/form.tpl
index ce5a711b2c..d480c0f732 100755
--- a/addressbook/templates/idsociety/form.tpl
+++ b/addressbook/templates/idsociety/form.tpl
@@ -298,14 +298,6 @@
     <td></td>
     <td colspan="4"><font size="-1"></font></td>
   </tr>
-  <tr>
-  <!-- BEGIN creator -->
-  {create}
-  <!-- END creator -->
-    <td colspan="3">
-      <font size="-1">
-    </td>
-  </tr>
   <tr>
     <td><font size="-1">{lang_notes}:</font></td>
     <td colspan="3">
@@ -331,5 +323,13 @@
 	<td></td>
   </tr>
 {custom}
+  <tr>
+  <!-- BEGIN creator -->
+  {create}
+  <!-- END creator -->
+    <td colspan="3">
+      <font size="-1">
+    </td>
+  </tr>
 </table>
 <!-- END addressbook entry form -->