More work on reset account form