Account controller fixed