diff --git a/app/models/user.rb b/app/models/user.rb
index 67476768d..2bc00913e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -17,7 +17,7 @@ class User < ApplicationRecord
   scope :active, -> { where(active: true) }
 
   def initials
-    name.scan(/\b\w/).join
+    name.to_s.scan(/\b\p{L}/).join.upcase
   end
 
   def deactivate
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 21544bf0f..5cb384b75 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -5,11 +5,11 @@ class UserTest < ActiveSupport::TestCase
     user = User.create! \
       account: accounts("37s"),
       name: "Victor Cooper",
-      email_address: "victor@37signals.com",
+      email_address: "victor@hey.com",
       password: "secret123456"
 
     assert_equal accounts("37s"), user.account
-    assert_equal user, User.authenticate_by(email_address: "victor@37signals.com", password: "secret123456")
+    assert_equal user, User.authenticate_by(email_address: "victor@hey.com", password: "secret123456")
   end
 
   test "deactivate" do
@@ -17,4 +17,10 @@ class UserTest < ActiveSupport::TestCase
       users(:jz).deactivate
     end
   end
+
+  test "initials" do
+    assert_equal "JF", User.new(name: "jason fried").initials
+    assert_equal "DHH", User.new(name: "David Heinemeier Hansson").initials
+    assert_equal "ÉLH", User.new(name: "Éva-Louise Hernández").initials
+  end
 end