fixed some user related issues