Fixed bugs with users