Various changes for user account management