Added better user account stuff