add Account const instead define (closes #4309)