Cleaned up account creation / state errors