diff --git a/src/bin/screens/edi_scm_screens.c b/src/bin/screens/edi_scm_screens.c
index ff6c0ae..f16873c 100644
--- a/src/bin/screens/edi_scm_screens.c
+++ b/src/bin/screens/edi_scm_screens.c
@@ -171,15 +171,21 @@ edi_scm_screens_binary_missing(Evas_Object *parent, const char *binary)
 const char *
 _edi_scm_avatar_cache_path_get(const char *email)
 {
-   return eina_stringshare_printf("%s/%s/avatars/%s.png", efreet_cache_home_get(),
+   return eina_stringshare_printf("%s/%s/avatars/%s.jpeg", efreet_cache_home_get(),
                                   PACKAGE_NAME, email);
 }
 
 void _edi_scm_screens_avatar_download_complete(void *data, const char *file,
-                                               EINA_UNUSED int status)
+                                               int status)
 {
    Evas_Object *image = data;
 
+   if (status != 200)
+     {
+        ecore_file_remove(file);
+        return;
+     }
+
    // TODO figure why this crashes
    //elm_image_file_set(image, file, NULL);
 }