User tab fixes