diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index e7641c3e32..9957835327 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -3065,7 +3065,7 @@ class addressbook_ui extends addressbook_bo
 	{
 		$response = Api\Json\Response::get();
 		$response->data((!($contact = $this->read($contact_id)) ||
-			empty($contact['jpegphoto']) &&	!(($contact['files'] & Api\Contacts::FILES_BIT_PHOTO) &&
+			empty($contact['photo']) &&	!(($contact['files'] & Api\Contacts::FILES_BIT_PHOTO) &&
 				($size = filesize($url=Api\Link::vfs_path('addressbook', $contact_id, Api\Contacts::FILES_PHOTO))))));
 	}
 
diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index ed7fc289a4..8b3ab7ea81 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -351,7 +351,7 @@
 				<row class="dialogHeader">
 					<box align="center">
 						<hbox disabled="@hidebuttons" class="avatar">
-							<avatar contact_id="$cont[id]" src="$cont[photo]" crop="false" editable="true"/>
+							<avatar id="jpegphoto" 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"/>