diff --git a/app/models/vcard.rb b/app/models/vcard.rb
index <HASH>..<HASH> 100644
--- a/app/models/vcard.rb
+++ b/app/models/vcard.rb
@@ -51,7 +51,9 @@ class Vcard < ActiveRecord::Base
   end
 
   def abbreviated_name
-    "#{given_name[0..0]}. #{family_name}"
+    return read_attribute(:full_name) if read_attribute(:full_name)
+
+    [given_name.try(:first).try(:upcase), family_name].compact.join(". ")
   end
 
   # Advanced finders
Vcard.abbreviated_name fixed to support both full_name and given/family name.