fixes for account join