diff --git a/lib/ditty/models/user.rb b/lib/ditty/models/user.rb
index <HASH>..<HASH> 100644
--- a/lib/ditty/models/user.rb
+++ b/lib/ditty/models/user.rb
@@ -57,7 +57,9 @@ module Ditty
     end
 
     def username
-      identity_dataset.first.username
+      identity = identity_dataset.first
+      return identity.username if identity
+      email
     end
 
     class << self
fix: Default to email as username if the user has no identity