fixing user stuff