From ce6d62167fd6ac4c35ecff67532817c077c6b7cb Mon Sep 17 00:00:00 2001
From: Patrick Simpson <p.simpson@etosis.com>
Date: Thu, 23 Feb 2017 17:17:50 +0100
Subject: [PATCH] [KOE-17] Small fix to lookup of current user

---
 .../Features/Signatures/FeatureSignatures.cs             | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/Signatures/FeatureSignatures.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/Signatures/FeatureSignatures.cs
index 8229828..e612e59 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/Signatures/FeatureSignatures.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/Signatures/FeatureSignatures.cs
@@ -229,16 +229,19 @@ namespace Acacia.Features.Signatures
                 // Look for the email address. If found, use the account associated with the GAB
                 using (ISearch<IContactItem> search = gab.Contacts.Search<IContactItem>())
                 {
-                    search.AddField("urn:schemas:contacts:email1").SetOperation(SearchOperation.Equal, account.SmtpAddress);
+                    search.AddField("urn:schemas:contacts:customerid").SetOperation(SearchOperation.Equal, account.UserName);
                     IItem result = search.SearchOne();
                     us = result as IContactItem;
                     if (result != null && result != us)
                         result.Dispose();
                 }
 
-                foreach (string signatureName in signatures)
+                if (us != null)
                 {
-                    ReplacePlaceholders(gab.ActiveAccount, us, signatureName);
+                    foreach (string signatureName in signatures)
+                    {
+                        ReplacePlaceholders(gab.ActiveAccount, us, signatureName);
+                    }
                 }
             }
             catch(Exception e)