diff --git a/app/drops/contact_drop.rb b/app/drops/contact_drop.rb
index 1d450adb7..16240ec06 100644
--- a/app/drops/contact_drop.rb
+++ b/app/drops/contact_drop.rb
@@ -12,7 +12,7 @@ class ContactDrop < BaseDrop
   end
 
   def first_name
-    @obj.try(:name).try(:split).try(:first).try(:capitalize) if @obj.try(:name).try(:split).try(:size) > 1
+    @obj.try(:name).try(:split).try(:first).try(:capitalize)
   end
 
   def last_name
diff --git a/app/drops/user_drop.rb b/app/drops/user_drop.rb
index cf6f1b6a1..83d5e2347 100644
--- a/app/drops/user_drop.rb
+++ b/app/drops/user_drop.rb
@@ -12,7 +12,7 @@ class UserDrop < BaseDrop
   end
 
   def first_name
-    @obj.try(:name).try(:split).try(:first).try(:capitalize) if @obj.try(:name).try(:split).try(:size).to_i > 1
+    @obj.try(:name).try(:split).try(:first).try(:capitalize)
   end
 
   def last_name
diff --git a/spec/drops/contact_drop_spec.rb b/spec/drops/contact_drop_spec.rb
index d00a0924d..cd6d1a185 100644
--- a/spec/drops/contact_drop_spec.rb
+++ b/spec/drops/contact_drop_spec.rb
@@ -11,6 +11,11 @@ describe ContactDrop do
       expect(subject.first_name).to eq 'John'
     end
 
+    it 'returns the single word (capitalized) as first name when name has only one word' do
+      contact.update!(name: 'john')
+      expect(subject.first_name).to eq 'John'
+    end
+
     it('return the capitalized name') do
       contact.update!(name: 'john doe')
       expect(subject.name).to eq 'John Doe'
diff --git a/spec/drops/user_drop_spec.rb b/spec/drops/user_drop_spec.rb
index 1093ec4a0..34f8f5eaa 100644
--- a/spec/drops/user_drop_spec.rb
+++ b/spec/drops/user_drop_spec.rb
@@ -11,6 +11,11 @@ describe UserDrop do
       expect(subject.first_name).to eq 'John'
     end
 
+    it 'returns the single word as first name when name has only one word' do
+      user.update!(name: 'John')
+      expect(subject.first_name).to eq 'John'
+    end
+
     it('return the capitalized first name') do
       user.update!(name: 'john doe')
       expect(subject.first_name).to eq 'John'