diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index e7e4d36074..548d94816c 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -2511,8 +2511,7 @@ window.egw_LAB.wait(function() {
 
 		// allow other apps to add tabs to addressbook edit
 		$preserve = $content;
-		unset($preserve['jpegphoto']);
-		$content['jpegphoto'] = !empty($content['jpegphoto']);	// unused and messes up json encoding (not utf-8)
+		unset($preserve['jpegphoto'], $content['jpegphoto']);	// unused and messes up json encoding (not utf-8)
 		$this->tmpl->setElementAttribute('tabs', 'add_tabs', true);
 		$tabs =& $this->tmpl->getElementAttribute('tabs', 'tabs');
 		if (($first_call = !isset($tabs)))
diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index 6deded9db0..253ae6e99b 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -349,7 +349,7 @@
 				<row class="dialogHeader">
 					<box align="center">
 						<hbox disabled="@hidebuttons" class="avatar">
-							<avatar contact_id="$cont[id]" crop="false" editable="true"/>
+							<avatar contact_id="$cont[id]" src="$cont[photo]" crop="false" editable="true"/>
 						</hbox>
 					</box>
 					<textbox id="n_fn" blur="Name" no_lang="1" tabindex="-1" class="cursorHand et2_fullWidth" onclick="jQuery('table.editname').css('display','inline'); var focElem = document.getElementById(form::name('n_prefix')); if (!(typeof(focElem) == 'undefined') &amp;&amp; typeof(focElem.focus)=='function') document.getElementById(form::name('n_prefix')).focus();" autocomplete="name"/>