Account controller modification