Bug fixes for account ownership