added user and admin fix