FIX issue #9: improving user account admin development