Added fix for user admin adding