User features - fixed problems