diff --git a/lib/locomotive/hosting/bushido/hooks.rb b/lib/locomotive/hosting/bushido/hooks.rb
index c7832685..db74fe61 100644
--- a/lib/locomotive/hosting/bushido/hooks.rb
+++ b/lib/locomotive/hosting/bushido/hooks.rb
@@ -3,5 +3,6 @@ Bushido::Data.listen("app.claimed") do |event|
 
   account = Account.first
   account.email = event["data"].try(:[], "email")
+  account.username = account.email
   account.save
 end