Added fix for users page