Fixed user account management to be more dynamic.