Issue 233 account validation