Account controller improvements