Type Registration and Account controller fixed