Fixes for account setup and OTR verification