Some fixes on the user stuff