diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/DebugInfo.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/DebugInfo.cs
index dc0244f..695331c 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/DebugInfo.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/DebugInfo.cs
@@ -90,7 +90,7 @@ namespace Acacia.Features.DebugSupport
                 // Add accounts
                 foreach (ZPushAccount account in ThisAddIn.Instance.Watcher.Accounts.GetAccounts())
                 {
-                    PropertyDescriptor p = new CustomPropertyDescriptor<ZPushAccount, DebugInfo>(account.DisplayName, DebugCategory.Accounts, account);
+                    PropertyDescriptor p = new CustomPropertyDescriptor<ZPushAccount, DebugInfo>(account.Account.DisplayName, DebugCategory.Accounts, account);
                     properties.Add(p);
                 }
 
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs
index c2ea0f8..5325331 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs
@@ -46,7 +46,7 @@ namespace Acacia.ZPush
         [Browsable(false)]
         public IAccount Account { get { return _account; } }
 
-        public string DisplayName { get { return _account.DisplayName; } }
+        public string DisplayName { get { return _account.SmtpAddress; } }
         public string DeviceId { get { return _account.DeviceId; } }
 
         [Browsable(false)]