diff --git a/enzevalos_iphone/AddressHandler.swift b/enzevalos_iphone/AddressHandler.swift
index d55c423b265d781776068d23e5f02722a8cf6bb5..49cca945def1fe9ce937f816c5576d6f07c14d2d 100644
--- a/enzevalos_iphone/AddressHandler.swift
+++ b/enzevalos_iphone/AddressHandler.swift
@@ -96,15 +96,16 @@ class AddressHandler {
                 }
             }
             if !insertedEntry {
+                var addrType: UIImage? = nil
+                
+                if address.label.label == "_$!<Work>!$_" {
+                    addrType = UIImage(named: "work2_white")!
+                }
+                if address.label.label == "_$!<Home>!$_" {
+                    addrType = UIImage(named: "home2_white")!
+                }
                 if let cn = con.cnContact {
-                    var addrType: UIImage? = nil
-
-                    if address.label.label == "_$!<Work>!$_" {
-                        addrType = UIImage(named: "work2_white")!
-                    }
-                    if address.label.label == "_$!<Home>!$_" {
-                        addrType = UIImage(named: "home2_white")!
-                    }
+                    
 
                     var color = cn.getColor()
                     if cn.thumbnailImageData != nil {
@@ -117,6 +118,11 @@ class AddressHandler {
                     list.append(entry)
                     localInserted.append(address.mailAddress)
                 }
+                else {
+                    var entry = (con.ezContact.getImageOrDefault(), con.ezContact.displayname ?? address.mailAddress, address.mailAddress, addrType, con.ezContact.getColor())
+                    list.append(entry)
+                    localInserted.append(address.mailAddress)
+                }
             }
         }
 
@@ -136,7 +142,7 @@ class AddressHandler {
 
         return list
     }
-
+    
     static func proveAddress(_ s: NSString) -> Bool {
         if addresses.contains((s as String).lowercased()) {
             return true